Skip to content

Commit f76c270

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web' (2 commits)
2 parents a2ffe00 + 4474e85 commit f76c270

File tree

5 files changed

+34
-38
lines changed

5 files changed

+34
-38
lines changed

‎clang/lib/Driver/ToolChains/Clang.cpp‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10554,11 +10554,10 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
1055410554

1055510555
// Disable all the extensions by default
1055610556
std::string ExtArg("-spirv-ext=-all");
10557-
std::string DefaultExtArg =
10557+
ExtArg +=
1055810558
",+SPV_EXT_shader_atomic_float_add,+SPV_EXT_shader_atomic_float_min_max"
1055910559
",+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls"
10560-
",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr";
10561-
std::string INTELExtArg =
10560+
",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr"
1056210561
",+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io"
1056310562
",+SPV_INTEL_device_side_avc_motion_estimation"
1056410563
",+SPV_INTEL_fpga_loop_controls,+SPV_INTEL_unstructured_loop_controls"
@@ -10581,19 +10580,18 @@ static void getTripleBasedSPIRVTransOpts(Compilation &C,
1058110580
",+SPV_INTEL_fpga_latency_control"
1058210581
",+SPV_KHR_shader_clock"
1058310582
",+SPV_INTEL_bindless_images"
10584-
",+SPV_INTEL_task_sequence";
10585-
ExtArg = ExtArg + DefaultExtArg + INTELExtArg;
10586-
ExtArg += ",+SPV_INTEL_bfloat16_conversion"
10587-
",+SPV_INTEL_joint_matrix"
10588-
",+SPV_INTEL_hw_thread_queries"
10589-
",+SPV_KHR_uniform_group_instructions"
10590-
",+SPV_INTEL_masked_gather_scatter"
10591-
",+SPV_INTEL_tensor_float32_conversion"
10592-
",+SPV_INTEL_optnone"
10593-
",+SPV_KHR_non_semantic_info"
10594-
",+SPV_KHR_cooperative_matrix"
10595-
",+SPV_EXT_shader_atomic_float16_add"
10596-
",+SPV_INTEL_fp_max_error";
10583+
",+SPV_INTEL_task_sequence"
10584+
",+SPV_INTEL_bfloat16_conversion"
10585+
",+SPV_INTEL_joint_matrix"
10586+
",+SPV_INTEL_hw_thread_queries"
10587+
",+SPV_KHR_uniform_group_instructions"
10588+
",+SPV_INTEL_masked_gather_scatter"
10589+
",+SPV_INTEL_tensor_float32_conversion"
10590+
",+SPV_INTEL_optnone"
10591+
",+SPV_KHR_non_semantic_info"
10592+
",+SPV_KHR_cooperative_matrix"
10593+
",+SPV_EXT_shader_atomic_float16_add"
10594+
",+SPV_INTEL_fp_max_error";
1059710595

1059810596
TranslatorArgs.push_back(TCArgs.MakeArgString(ExtArg));
1059910597
}

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -851,11 +851,10 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
851851

852852
// Disable all the extensions by default
853853
std::string ExtArg("-spirv-ext=-all");
854-
std::string DefaultExtArg =
854+
ExtArg +=
855855
",+SPV_EXT_shader_atomic_float_add,+SPV_EXT_shader_atomic_float_min_max"
856856
",+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls"
857-
",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr";
858-
std::string INTELExtArg =
857+
",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr"
859858
",+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io"
860859
",+SPV_INTEL_device_side_avc_motion_estimation"
861860
",+SPV_INTEL_fpga_loop_controls,+SPV_INTEL_unstructured_loop_controls"
@@ -878,19 +877,18 @@ getTripleBasedSPIRVTransOpts(const ArgList &Args,
878877
",+SPV_INTEL_fpga_latency_control"
879878
",+SPV_KHR_shader_clock"
880879
",+SPV_INTEL_bindless_images"
881-
",+SPV_INTEL_task_sequence";
882-
ExtArg = ExtArg + DefaultExtArg + INTELExtArg;
883-
ExtArg += ",+SPV_INTEL_bfloat16_conversion"
884-
",+SPV_INTEL_joint_matrix"
885-
",+SPV_INTEL_hw_thread_queries"
886-
",+SPV_KHR_uniform_group_instructions"
887-
",+SPV_INTEL_masked_gather_scatter"
888-
",+SPV_INTEL_tensor_float32_conversion"
889-
",+SPV_INTEL_optnone"
890-
",+SPV_KHR_non_semantic_info"
891-
",+SPV_KHR_cooperative_matrix"
892-
",+SPV_EXT_shader_atomic_float16_add"
893-
",+SPV_INTEL_fp_max_error";
880+
",+SPV_INTEL_task_sequence"
881+
",+SPV_INTEL_bfloat16_conversion"
882+
",+SPV_INTEL_joint_matrix"
883+
",+SPV_INTEL_hw_thread_queries"
884+
",+SPV_KHR_uniform_group_instructions"
885+
",+SPV_INTEL_masked_gather_scatter"
886+
",+SPV_INTEL_tensor_float32_conversion"
887+
",+SPV_INTEL_optnone"
888+
",+SPV_KHR_non_semantic_info"
889+
",+SPV_KHR_cooperative_matrix"
890+
",+SPV_EXT_shader_atomic_float16_add"
891+
",+SPV_INTEL_fp_max_error";
894892
TranslatorArgs.push_back(Args.MakeArgString(ExtArg));
895893
}
896894

‎sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
1212
// RUN: env IGC_DumpToCustomDir=%t.dir NEO_CACHE_PERSISTENT=0 IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
13-
// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir 2914 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
14-
// RUN: %{run-aux} echo "Baseline from driver version 1.3.30872"
13+
// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir 2743 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
14+
// RUN: %{run-aux} echo "Baseline from driver version 1.13.35563"
1515

1616
#include "../BitonicSortK.cpp"

‎sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
1212
// RUN: env IGC_DumpToCustomDir=%t.dir NEO_CACHE_PERSISTENT=0 IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
13-
// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir 2969 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
14-
// RUN: %{run-aux} echo "Baseline from driver version 1.3.30872"
13+
// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir 2798 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
14+
// RUN: %{run-aux} echo "Baseline from driver version 1.13.35563"
1515

1616
#include "../BitonicSortKv2.cpp"

‎sycl/test-e2e/Regression/barrier_with_work.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// UNSUPPORTED: target-native_cpu
77
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20142
88
//
9-
// XFAIL: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21 || arch-intel_gpu_pvc) && !igc-dev
10-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20600
9+
// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21 || arch-intel_gpu_pvc) && !igc-dev
10+
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20600
1111
//
1212
// Tests that barriers block all following execution on queues with active work.
1313
// For L0 we currently need to set

0 commit comments

Comments
 (0)