Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion clang/lib/Driver/ToolChains/Clang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11288,7 +11288,11 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
",+SPV_KHR_cooperative_matrix"
",+SPV_EXT_shader_atomic_float16_add"
",+SPV_INTEL_fp_max_error"
",+SPV_INTEL_memory_access_aliasing";
",+SPV_INTEL_memory_access_aliasing"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know if GPU driver support for these extensions is only available in somewhat recent drivers or has it been available for a while? I ask because we need to support LTS drivers which are not frequently updated.

",+SPV_INTEL_fp_conversions"
",+SPV_EXT_float8"
",+SPV_KHR_bfloat16"
",+SPV_INTEL_float4";

TranslatorArgs.push_back(TCArgs.MakeArgString(ExtArg));
}
Expand Down
4 changes: 4 additions & 0 deletions clang/test/Driver/sycl-spirv-ext-old-model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@
// CHECK-DEFAULT-SAME:,+SPV_EXT_shader_atomic_float16_add
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fp_max_error
// CHECK-DEFAULT-SAME:,+SPV_INTEL_memory_access_aliasing
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fp_conversions
// CHECK-DEFAULT-SAME:,+SPV_EXT_float8
// CHECK-DEFAULT-SAME:,+SPV_KHR_bfloat16
// CHECK-DEFAULT-SAME:,+SPV_INTEL_float4
4 changes: 4 additions & 0 deletions clang/test/Driver/sycl-spirv-ext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@
// CHECK-DEFAULT-SAME:,+SPV_EXT_shader_atomic_float16_add
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fp_max_error
// CHECK-DEFAULT-SAME:,+SPV_INTEL_memory_access_aliasing
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fp_conversions
// CHECK-DEFAULT-SAME:,+SPV_EXT_float8
// CHECK-DEFAULT-SAME:,+SPV_KHR_bfloat16
// CHECK-DEFAULT-SAME:,+SPV_INTEL_float4
2 changes: 1 addition & 1 deletion clang/test/Driver/sycl-spirv-metadata-old-model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_INTEL_float4"

// CHECK-WITHOUT: "{{.*}}llvm-spirv"
// CHECK-WITHOUT-NOT: --spirv-preserve-auxdata
2 changes: 1 addition & 1 deletion clang/test/Driver/sycl-spirv-obj-old-model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_INTEL_float4"
// SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]"
// SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu"
// SPIRV_DEVICE_OBJ-SAME: "-fsycl-is-host"
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/sycl-spirv-obj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_INTEL_float4"
// SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]"
// SPIRV_DEVICE_OBJ: llvm-offload-binary{{.*}} "--image=file=[[DEVICE_SPV]]{{.*}}"
// SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu"
Expand Down
6 changes: 5 additions & 1 deletion clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,11 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
",+SPV_KHR_cooperative_matrix"
",+SPV_EXT_shader_atomic_float16_add"
",+SPV_INTEL_fp_max_error"
",+SPV_INTEL_memory_access_aliasing";
",+SPV_INTEL_memory_access_aliasing"
",+SPV_INTEL_fp_conversions"
",+SPV_EXT_float8"
",+SPV_KHR_bfloat16"
",+SPV_INTEL_float4";
TranslatorArgs.push_back(Args.MakeArgString(ExtArg));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ SPIRV::TranslatorOpts &SPIRVLLVMTranslator::translatorOpts() {
SPIRV::ExtensionID::SPV_KHR_non_semantic_info,
SPIRV::ExtensionID::SPV_KHR_cooperative_matrix,
SPIRV::ExtensionID::SPV_EXT_shader_atomic_float16_add,
SPIRV::ExtensionID::SPV_INTEL_fp_max_error};
SPIRV::ExtensionID::SPV_INTEL_fp_max_error,
SPIRV::ExtensionID::SPV_INTEL_memory_access_aliasing,
SPIRV::ExtensionID::SPV_INTEL_fp_conversions,
SPIRV::ExtensionID::SPV_EXT_float8,
SPIRV::ExtensionID::SPV_KHR_bfloat16,
SPIRV::ExtensionID::SPV_INTEL_float4};

static auto Opts = [&]() -> SPIRV::TranslatorOpts {
// Options for translation between SPIR-V and LLVM IR.
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Experimental/fp4/e2m1_cri_conversion.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_INTEL_float4,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_INTEL_float4,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Experimental/fp8/e4m3_cri_conversion.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Experimental/fp8/e5m2_cri_conversion.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/Experimental/fp8/e8m0_cri_conversion.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// REQUIRES: arch-intel_gpu_cri
// RUN: %{build} -Xclang -freg-struct-return -Xspirv-translator=spir64 --spirv-ext=+SPV_INTEL_fp_conversions,+SPV_EXT_float8,+SPV_KHR_bfloat16 -o %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: target-nvidia, target-amd, spirv-backend
Expand Down
Loading