From 5133775d9ab23f5a82427e82bdeb4661aa1e89ee Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Mon, 26 Aug 2024 19:13:32 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"[SYCL][Driver]=20Enable=20SPV=5FINTEL?= =?UTF-8?q?=5Fmemory=5Faccess=5Faliasing=20extension=20(#14=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0a9db37782cd258348692229ea513ffcee58de3a. --- clang/lib/Driver/ToolChains/Clang.cpp | 3 +-- clang/test/Driver/sycl-spirv-ext-old-model.c | 4 +--- clang/test/Driver/sycl-spirv-metadata-old-model.cpp | 2 +- clang/test/Driver/sycl-spirv-obj-old-model.cpp | 2 +- clang/test/Driver/sycl-spirv-obj.cpp | 2 +- clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index d6b89f109e96c..54c19e4a86b5b 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -10513,8 +10513,7 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C, ",+SPV_INTEL_tensor_float32_conversion" ",+SPV_INTEL_optnone" ",+SPV_KHR_non_semantic_info" - ",+SPV_KHR_cooperative_matrix" - ",+SPV_INTEL_memory_access_aliasing"; + ",+SPV_KHR_cooperative_matrix"; if (IsCPU) ExtArg += ",+SPV_INTEL_fp_max_error"; diff --git a/clang/test/Driver/sycl-spirv-ext-old-model.c b/clang/test/Driver/sycl-spirv-ext-old-model.c index 97ea39ff3ea46..643de972d9f70 100644 --- a/clang/test/Driver/sycl-spirv-ext-old-model.c +++ b/clang/test/Driver/sycl-spirv-ext-old-model.c @@ -61,8 +61,7 @@ // CHECK-DEFAULT-SAME:,+SPV_INTEL_tensor_float32_conversion // CHECK-DEFAULT-SAME:,+SPV_INTEL_optnone // CHECK-DEFAULT-SAME:,+SPV_KHR_non_semantic_info -// CHECK-DEFAULT-SAME:,+SPV_KHR_cooperative_matrix -// CHECK-DEFAULT-SAME:,+SPV_INTEL_memory_access_aliasing" +// CHECK-DEFAULT-SAME:,+SPV_KHR_cooperative_matrix" // CHECK-FPGA-HW: llvm-spirv{{.*}}"-spirv-ext=-all // CHECK-FPGA-HW-SAME:,+SPV_EXT_shader_atomic_float_add // CHECK-FPGA-HW-SAME:,+SPV_EXT_shader_atomic_float_min_max @@ -128,5 +127,4 @@ // CHECK-CPU-SAME:,+SPV_INTEL_optnone // CHECK-CPU-SAME:,+SPV_KHR_non_semantic_info // CHECK-CPU-SAME:,+SPV_KHR_cooperative_matrix -// CHECK-CPU-SAME:,+SPV_INTEL_memory_access_aliasing // CHECK-CPU-SAME:,+SPV_INTEL_fp_max_error" diff --git a/clang/test/Driver/sycl-spirv-metadata-old-model.cpp b/clang/test/Driver/sycl-spirv-metadata-old-model.cpp index 2e19dd9ed1dc4..4efbe45a080b2 100644 --- a/clang/test/Driver/sycl-spirv-metadata-old-model.cpp +++ b/clang/test/Driver/sycl-spirv-metadata-old-model.cpp @@ -9,7 +9,7 @@ // RUN: FileCheck -check-prefix CHECK-WITHOUT %s // CHECK-WITH: llvm-spirv{{.*}} "--spirv-preserve-auxdata" -// CHECK-WITH-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing" +// CHECK-WITH-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix" // CHECK-WITHOUT: "{{.*}}llvm-spirv" // CHECK-WITHOUT-NOT: --spirv-preserve-auxdata diff --git a/clang/test/Driver/sycl-spirv-obj-old-model.cpp b/clang/test/Driver/sycl-spirv-obj-old-model.cpp index 7a5f6215e31ae..809c52516fbb9 100644 --- a/clang/test/Driver/sycl-spirv-obj-old-model.cpp +++ b/clang/test/Driver/sycl-spirv-obj-old-model.cpp @@ -11,7 +11,7 @@ // SPIRV_DEVICE_OBJ-SAME: "-o" "[[DEVICE_BC:.+\.bc]]" // SPIRV_DEVICE_OBJ: llvm-spirv{{.*}} "-o" "[[DEVICE_SPV:.+\.spv]]" // SPIRV_DEVICE_OBJ-SAME: "--spirv-preserve-auxdata" -// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing" +// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix" // SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]" // SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu" // SPIRV_DEVICE_OBJ-SAME: "-fsycl-is-host" diff --git a/clang/test/Driver/sycl-spirv-obj.cpp b/clang/test/Driver/sycl-spirv-obj.cpp index 4c86daf4a1264..6c651129f2f3e 100644 --- a/clang/test/Driver/sycl-spirv-obj.cpp +++ b/clang/test/Driver/sycl-spirv-obj.cpp @@ -11,7 +11,7 @@ // SPIRV_DEVICE_OBJ-SAME: "-o" "[[DEVICE_BC:.+\.bc]]" // SPIRV_DEVICE_OBJ: llvm-spirv{{.*}} "-o" "[[DEVICE_SPV:.+\.spv]]" // SPIRV_DEVICE_OBJ-SAME: "--spirv-preserve-auxdata" -// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing" +// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix" // SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]" // SPIRV_DEVICE_OBJ: clang-offload-packager{{.*}} "--image=file=[[DEVICE_SPV]]{{.*}}" // SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu" diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index edb97cf431d1e..e7294a314bc8a 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -875,8 +875,7 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args, ",+SPV_INTEL_tensor_float32_conversion" ",+SPV_INTEL_optnone" ",+SPV_KHR_non_semantic_info" - ",+SPV_KHR_cooperative_matrix" - ",+SPV_INTEL_memory_access_aliasing"; + ",+SPV_KHR_cooperative_matrix"; if (IsCPU) ExtArg += ",+SPV_INTEL_fp_max_error"; TranslatorArgs.push_back(Args.MakeArgString(ExtArg));