Skip to content

Commit 3377fda

Browse files
committed
[SYCL][SPIR-V][New offload model] Add new SPIR-V extension test for new offloading model
Signed-off-by: Arvind Sudarsanam <[email protected]>
1 parent e94cfda commit 3377fda

File tree

2 files changed

+96
-3
lines changed

2 files changed

+96
-3
lines changed

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

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// REQUIRES: system-linux
2+
// -------
3+
// Generate .o file as SYCL device library file.
4+
//
5+
// RUN: touch %t.devicelib.cpp
6+
// RUN: %clang %t.devicelib.cpp -fsycl -fsycl-targets=spir64-unknown-unknown -c --offload-new-driver -o %t_1.devicelib.o
7+
// RUN: %clang %t.devicelib.cpp -fsycl -fsycl-targets=spir64_gen-unknown-unknown -c --offload-new-driver -o %t_2.devicelib.o
8+
// RUN: %clang %t.devicelib.cpp -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown -c --offload-new-driver -o %t_3.devicelib.o
9+
/// Check llvm-spirv extensions that are set
10+
11+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl --offload-new-driver -fsycl-targets=spir64-unknown-unknown -c %s -o %t_1.o
12+
// RUN: clang-linker-wrapper -sycl-device-libraries=%t_1.devicelib.o "--host-triple=x86_64-unknown-linux-gnu" "--linker-path=/usr/bin/ld" "--" HOST_LINKER_FLAGS "-dynamic-linker" HOST_DYN_LIB "-o" "a.out" HOST_LIB_PATH HOST_STAT_LIB %t_1.o --dry-run 2>&1 | FileCheck -check-prefix=CHECK-DEFAULT %s
13+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl --offload-new-driver -fsycl-targets=spir64_gen-unknown-unknown -c %s -o %t_2.o
14+
// RUN: clang-linker-wrapper -sycl-device-libraries=%t_2.devicelib.o "--host-triple=x86_64-unknown-linux-gnu" "--linker-path=/usr/bin/ld" "--" HOST_LINKER_FLAGS "-dynamic-linker" HOST_DYN_LIB "-o" "a.out" HOST_LIB_PATH HOST_STAT_LIB %t_2.o --dry-run 2>&1 | FileCheck -check-prefix=CHECK-DEFAULT %s
15+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl --offload-new-driver -fsycl-targets=spir64_x86_64-unknown-unknown -c %s -o %t_3.o
16+
// RUN: clang-linker-wrapper -sycl-device-libraries=%t_3.devicelib.o "--host-triple=x86_64-unknown-linux-gnu" "--linker-path=/usr/bin/ld" "--" HOST_LINKER_FLAGS "-dynamic-linker" HOST_DYN_LIB "-o" "a.out" HOST_LIB_PATH HOST_STAT_LIB %t_3.o --dry-run 2>&1 | FileCheck -check-prefix=CHECK-CPU %s
17+
18+
// CHECK-DEFAULT: llvm-spirv{{.*}}-spirv-ext=-all
19+
// CHECK-DEFAULT-SAME:,+SPV_EXT_shader_atomic_float_add
20+
// CHECK-DEFAULT-SAME:,+SPV_EXT_shader_atomic_float_min_max
21+
// CHECK-DEFAULT-SAME:,+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls
22+
// CHECK-DEFAULT-SAME:,+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr
23+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io
24+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_device_side_avc_motion_estimation
25+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_loop_controls
26+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_unstructured_loop_controls,+SPV_INTEL_fpga_reg
27+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_blocking_pipes,+SPV_INTEL_function_pointers
28+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_kernel_attributes,+SPV_INTEL_io_pipes
29+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_inline_assembly,+SPV_INTEL_arbitrary_precision_integers
30+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_float_controls2
31+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_vector_compute,+SPV_INTEL_fast_composite
32+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_arbitrary_precision_fixed_point
33+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_arbitrary_precision_floating_point
34+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_variable_length_array,+SPV_INTEL_fp_fast_math_mode
35+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_long_constant_composite
36+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_arithmetic_fence
37+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_cache_controls
38+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_buffer_location
39+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_argument_interfaces
40+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes
41+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_fpga_latency_control
42+
// CHECK-DEFAULT-SAME:,+SPV_KHR_shader_clock
43+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_bindless_images
44+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_task_sequence
45+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_token_type
46+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_bfloat16_conversion
47+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_joint_matrix
48+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_hw_thread_queries
49+
// CHECK-DEFAULT-SAME:,+SPV_KHR_uniform_group_instructions
50+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_masked_gather_scatter
51+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_tensor_float32_conversion
52+
// CHECK-DEFAULT-SAME:,+SPV_INTEL_optnone
53+
// CHECK-DEFAULT-SAME:,+SPV_KHR_non_semantic_info
54+
// CHECK-DEFAULT-SAME:,+SPV_KHR_cooperative_matrix
55+
// CHECK-DEFAULT-SAME:,+SPV_EXT_shader_atomic_float16_add
56+
// CHECK-CPU: llvm-spirv{{.*}}-spirv-allow-unknown-intrinsics=llvm.genx.,llvm.fpbuiltin
57+
// CHECK-CPU-SAME: {{.*}}-spirv-ext=-all
58+
// CHECK-CPU-SAME:,+SPV_EXT_shader_atomic_float_add
59+
// CHECK-CPU-SAME:,+SPV_EXT_shader_atomic_float_min_max
60+
// CHECK-CPU-SAME:,+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls
61+
// CHECK-CPU-SAME:,+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr
62+
// CHECK-CPU-SAME:,+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io
63+
// CHECK-CPU-SAME:,+SPV_INTEL_device_side_avc_motion_estimation
64+
// CHECK-CPU-SAME:,+SPV_INTEL_fpga_loop_controls
65+
// CHECK-CPU-SAME:,+SPV_INTEL_unstructured_loop_controls,+SPV_INTEL_fpga_reg
66+
// CHECK-CPU-SAME:,+SPV_INTEL_blocking_pipes,+SPV_INTEL_function_pointers
67+
// CHECK-CPU-SAME:,+SPV_INTEL_kernel_attributes,+SPV_INTEL_io_pipes
68+
// CHECK-CPU-SAME:,+SPV_INTEL_inline_assembly,+SPV_INTEL_arbitrary_precision_integers
69+
// CHECK-CPU-SAME:,+SPV_INTEL_float_controls2
70+
// CHECK-CPU-SAME:,+SPV_INTEL_vector_compute,+SPV_INTEL_fast_composite
71+
// CHECK-CPU-SAME:,+SPV_INTEL_arbitrary_precision_fixed_point
72+
// CHECK-CPU-SAME:,+SPV_INTEL_arbitrary_precision_floating_point
73+
// CHECK-CPU-SAME:,+SPV_INTEL_variable_length_array,+SPV_INTEL_fp_fast_math_mode
74+
// CHECK-CPU-SAME:,+SPV_INTEL_long_constant_composite
75+
// CHECK-CPU-SAME:,+SPV_INTEL_arithmetic_fence
76+
// CHECK-CPU-SAME:,+SPV_INTEL_cache_controls
77+
// CHECK-CPU-SAME:,+SPV_INTEL_fpga_buffer_location
78+
// CHECK-CPU-SAME:,+SPV_INTEL_fpga_argument_interfaces
79+
// CHECK-CPU-SAME:,+SPV_INTEL_fpga_invocation_pipelining_attributes
80+
// CHECK-CPU-SAME:,+SPV_INTEL_fpga_latency_control
81+
// CHECK-CPU-SAME:,+SPV_INTEL_task_sequence
82+
// CHECK-CPU-SAME:,+SPV_INTEL_token_type
83+
// CHECK-CPU-SAME:,+SPV_INTEL_bfloat16_conversion
84+
// CHECK-CPU-SAME:,+SPV_INTEL_joint_matrix
85+
// CHECK-CPU-SAME:,+SPV_INTEL_hw_thread_queries
86+
// CHECK-CPU-SAME:,+SPV_KHR_uniform_group_instructions
87+
// CHECK-CPU-SAME:,+SPV_INTEL_masked_gather_scatter
88+
// CHECK-CPU-SAME:,+SPV_INTEL_tensor_float32_conversion
89+
// CHECK-CPU-SAME:,+SPV_INTEL_optnone
90+
// CHECK-CPU-SAME:,+SPV_KHR_non_semantic_info
91+
// CHECK-CPU-SAME:,+SPV_KHR_cooperative_matrix
92+
// CHECK-CPU-SAME:,+SPV_INTEL_fp_max_error

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -872,9 +872,9 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
872872
",+SPV_INTEL_fpga_argument_interfaces"
873873
",+SPV_INTEL_fpga_invocation_pipelining_attributes"
874874
",+SPV_INTEL_fpga_latency_control"
875-
",+SPV_INTEL_task_sequence"
876875
",+SPV_KHR_shader_clock"
877-
",+SPV_INTEL_bindless_images";
876+
",+SPV_INTEL_bindless_images"
877+
",+SPV_INTEL_task_sequence";
878878
ExtArg = ExtArg + DefaultExtArg + INTELExtArg;
879879
ExtArg += ",+SPV_INTEL_token_type"
880880
",+SPV_INTEL_bfloat16_conversion"
@@ -885,7 +885,8 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
885885
",+SPV_INTEL_tensor_float32_conversion"
886886
",+SPV_INTEL_optnone"
887887
",+SPV_KHR_non_semantic_info"
888-
",+SPV_KHR_cooperative_matrix";
888+
",+SPV_KHR_cooperative_matrix"
889+
",+SPV_EXT_shader_atomic_float16_add";
889890
if (IsCPU)
890891
ExtArg += ",+SPV_INTEL_fp_max_error";
891892
TranslatorArgs.push_back(Args.MakeArgString(ExtArg));

0 commit comments

Comments
 (0)