diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 6e2b2d3030b8a..4694647692da1 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -10430,7 +10430,8 @@ static void getOtherSPIRVTransOpts(Compilation &C, ",+SPV_INTEL_masked_gather_scatter" ",+SPV_INTEL_tensor_float32_conversion" ",+SPV_INTEL_optnone" - ",+SPV_KHR_non_semantic_info"; + ",+SPV_KHR_non_semantic_info" + ",+SPV_KHR_cooperative_matrix"; if (IsCPU) ExtArg += ",+SPV_INTEL_fp_max_error"; diff --git a/clang/test/Driver/sycl-spirv-ext.c b/clang/test/Driver/sycl-spirv-ext.c index 4a4544b633991..a306b9eb1ea4d 100644 --- a/clang/test/Driver/sycl-spirv-ext.c +++ b/clang/test/Driver/sycl-spirv-ext.c @@ -57,7 +57,8 @@ // CHECK-DEFAULT-SAME:,+SPV_INTEL_masked_gather_scatter // 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_non_semantic_info +// 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 @@ -122,5 +123,6 @@ // CHECK-CPU-SAME:,+SPV_INTEL_tensor_float32_conversion // 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_fp_max_error" diff --git a/clang/test/Driver/sycl-spirv-metadata.cpp b/clang/test/Driver/sycl-spirv-metadata.cpp index f004ff89b1e52..7218174c5ea55 100644 --- a/clang/test/Driver/sycl-spirv-metadata.cpp +++ b/clang/test/Driver/sycl-spirv-metadata.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_KHR_non_semantic_info" +// 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.cpp b/clang/test/Driver/sycl-spirv-obj.cpp index 9ffbc60612ab3..444f24223c201 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_KHR_non_semantic_info" +// 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"