From d91826a4452149e2923078c6dd0d4fb2bf5151d1 Mon Sep 17 00:00:00 2001 From: Dmitry Sidorov Date: Tue, 22 Oct 2024 13:17:18 +0200 Subject: [PATCH] [SYCL] Disable SPV_INTEL_token_type extension (#14772) It's not used right now. --------- Signed-off-by: Sidorov, Dmitry --- clang/lib/Driver/ToolChains/Clang.cpp | 3 +-- clang/test/Driver/sycl-spirv-ext-old-model.c | 2 -- clang/test/Driver/sycl-spirv-ext.c | 2 -- clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp | 3 +-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 34249b34015f..ce65dd663333 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -10685,8 +10685,7 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C, ",+SPV_INTEL_fpga_memory_attributes"; else // Don't enable several freshly added extensions on FPGA H/W - ExtArg += ",+SPV_INTEL_token_type" - ",+SPV_INTEL_bfloat16_conversion" + ExtArg += ",+SPV_INTEL_bfloat16_conversion" ",+SPV_INTEL_joint_matrix" ",+SPV_INTEL_hw_thread_queries" ",+SPV_KHR_uniform_group_instructions" diff --git a/clang/test/Driver/sycl-spirv-ext-old-model.c b/clang/test/Driver/sycl-spirv-ext-old-model.c index 59ade9b972b7..cde451bba65d 100644 --- a/clang/test/Driver/sycl-spirv-ext-old-model.c +++ b/clang/test/Driver/sycl-spirv-ext-old-model.c @@ -52,7 +52,6 @@ // CHECK-DEFAULT-SAME:,+SPV_KHR_shader_clock // CHECK-DEFAULT-SAME:,+SPV_INTEL_bindless_images // CHECK-DEFAULT-SAME:,+SPV_INTEL_task_sequence -// CHECK-DEFAULT-SAME:,+SPV_INTEL_token_type // CHECK-DEFAULT-SAME:,+SPV_INTEL_bfloat16_conversion // CHECK-DEFAULT-SAME:,+SPV_INTEL_joint_matrix // CHECK-DEFAULT-SAME:,+SPV_INTEL_hw_thread_queries @@ -118,7 +117,6 @@ // CHECK-CPU-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes // CHECK-CPU-SAME:,+SPV_INTEL_fpga_latency_control // CHECK-CPU-SAME:,+SPV_INTEL_task_sequence -// CHECK-CPU-SAME:,+SPV_INTEL_token_type // CHECK-CPU-SAME:,+SPV_INTEL_bfloat16_conversion // CHECK-CPU-SAME:,+SPV_INTEL_joint_matrix // CHECK-CPU-SAME:,+SPV_INTEL_hw_thread_queries diff --git a/clang/test/Driver/sycl-spirv-ext.c b/clang/test/Driver/sycl-spirv-ext.c index bd3f373ba1fd..f1a78714adbd 100644 --- a/clang/test/Driver/sycl-spirv-ext.c +++ b/clang/test/Driver/sycl-spirv-ext.c @@ -53,7 +53,6 @@ // CHECK-DEFAULT-SAME:,+SPV_KHR_shader_clock // CHECK-DEFAULT-SAME:,+SPV_INTEL_bindless_images // CHECK-DEFAULT-SAME:,+SPV_INTEL_task_sequence -// CHECK-DEFAULT-SAME:,+SPV_INTEL_token_type // CHECK-DEFAULT-SAME:,+SPV_INTEL_bfloat16_conversion // CHECK-DEFAULT-SAME:,+SPV_INTEL_joint_matrix // CHECK-DEFAULT-SAME:,+SPV_INTEL_hw_thread_queries @@ -90,7 +89,6 @@ // CHECK-CPU-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes // CHECK-CPU-SAME:,+SPV_INTEL_fpga_latency_control // CHECK-CPU-SAME:,+SPV_INTEL_task_sequence -// CHECK-CPU-SAME:,+SPV_INTEL_token_type // CHECK-CPU-SAME:,+SPV_INTEL_bfloat16_conversion // CHECK-CPU-SAME:,+SPV_INTEL_joint_matrix // CHECK-CPU-SAME:,+SPV_INTEL_hw_thread_queries diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index 56ab0c96df74..032c8a81c477 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -876,8 +876,7 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args, ",+SPV_INTEL_bindless_images" ",+SPV_INTEL_task_sequence"; ExtArg = ExtArg + DefaultExtArg + INTELExtArg; - ExtArg += ",+SPV_INTEL_token_type" - ",+SPV_INTEL_bfloat16_conversion" + ExtArg += ",+SPV_INTEL_bfloat16_conversion" ",+SPV_INTEL_joint_matrix" ",+SPV_INTEL_hw_thread_queries" ",+SPV_KHR_uniform_group_instructions"