Skip to content

Commit 0a9db37

Browse files
authored
[SYCL][Driver] Enable SPV_INTEL_memory_access_aliasing extension (#14992)
Signed-off-by: Marcos Maronas <marcos.maronas@intel.com>
1 parent 2f3919e commit 0a9db37

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -10515,7 +10515,8 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
1051510515
",+SPV_INTEL_tensor_float32_conversion"
1051610516
",+SPV_INTEL_optnone"
1051710517
",+SPV_KHR_non_semantic_info"
10518-
",+SPV_KHR_cooperative_matrix";
10518+
",+SPV_KHR_cooperative_matrix"
10519+
",+SPV_INTEL_memory_access_aliasing";
1051910520
if (IsCPU)
1052010521
ExtArg += ",+SPV_INTEL_fp_max_error";
1052110522

clang/test/Driver/sycl-spirv-ext-old-model.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
// CHECK-DEFAULT-SAME:,+SPV_INTEL_tensor_float32_conversion
6262
// CHECK-DEFAULT-SAME:,+SPV_INTEL_optnone
6363
// CHECK-DEFAULT-SAME:,+SPV_KHR_non_semantic_info
64-
// CHECK-DEFAULT-SAME:,+SPV_KHR_cooperative_matrix"
64+
// CHECK-DEFAULT-SAME:,+SPV_KHR_cooperative_matrix
65+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_memory_access_aliasing"
6566
// CHECK-FPGA-HW: llvm-spirv{{.*}}"-spirv-ext=-all
6667
// CHECK-FPGA-HW-SAME:,+SPV_EXT_shader_atomic_float_add
6768
// CHECK-FPGA-HW-SAME:,+SPV_EXT_shader_atomic_float_min_max
@@ -127,4 +128,5 @@
127128
// CHECK-CPU-SAME:,+SPV_INTEL_optnone
128129
// CHECK-CPU-SAME:,+SPV_KHR_non_semantic_info
129130
// CHECK-CPU-SAME:,+SPV_KHR_cooperative_matrix
131+
// CHECK-CPU-SAME:,+SPV_INTEL_memory_access_aliasing
130132
// CHECK-CPU-SAME:,+SPV_INTEL_fp_max_error"

clang/test/Driver/sycl-spirv-metadata-old-model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// RUN: FileCheck -check-prefix CHECK-WITHOUT %s
1010

1111
// CHECK-WITH: llvm-spirv{{.*}} "--spirv-preserve-auxdata"
12-
// CHECK-WITH-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix"
12+
// CHECK-WITH-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing"
1313

1414
// CHECK-WITHOUT: "{{.*}}llvm-spirv"
1515
// CHECK-WITHOUT-NOT: --spirv-preserve-auxdata

clang/test/Driver/sycl-spirv-obj-old-model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPIRV_DEVICE_OBJ-SAME: "-o" "[[DEVICE_BC:.+\.bc]]"
1212
// SPIRV_DEVICE_OBJ: llvm-spirv{{.*}} "-o" "[[DEVICE_SPV:.+\.spv]]"
1313
// SPIRV_DEVICE_OBJ-SAME: "--spirv-preserve-auxdata"
14-
// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix"
14+
// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing"
1515
// SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]"
1616
// SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu"
1717
// SPIRV_DEVICE_OBJ-SAME: "-fsycl-is-host"

clang/test/Driver/sycl-spirv-obj.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPIRV_DEVICE_OBJ-SAME: "-o" "[[DEVICE_BC:.+\.bc]]"
1212
// SPIRV_DEVICE_OBJ: llvm-spirv{{.*}} "-o" "[[DEVICE_SPV:.+\.spv]]"
1313
// SPIRV_DEVICE_OBJ-SAME: "--spirv-preserve-auxdata"
14-
// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_cooperative_matrix"
14+
// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_INTEL_memory_access_aliasing"
1515
// SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]"
1616
// SPIRV_DEVICE_OBJ: clang-offload-packager{{.*}} "--image=file=[[DEVICE_SPV]]{{.*}}"
1717
// SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu"

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,8 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
875875
",+SPV_INTEL_tensor_float32_conversion"
876876
",+SPV_INTEL_optnone"
877877
",+SPV_KHR_non_semantic_info"
878-
",+SPV_KHR_cooperative_matrix";
878+
",+SPV_KHR_cooperative_matrix"
879+
",+SPV_INTEL_memory_access_aliasing";
879880
if (IsCPU)
880881
ExtArg += ",+SPV_INTEL_fp_max_error";
881882
TranslatorArgs.push_back(Args.MakeArgString(ExtArg));

0 commit comments

Comments
 (0)