Skip to content

Commit f6dc1d4

Browse files
mylermyler
authored
Merge pull request intel#851 from myler/correct_test_name
correct tests in llvm_test_suite_sycl_esimd suite by suite_generator_sycl.pl to fix the configFile name
2 parents 9a62df2 + 2bcce5c commit f6dc1d4

8 files changed

+69
-33
lines changed

‎config_sycl/plugin_interop_level_zero_buffer.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL/Plugin/interop-level-zero-buffer.cpp

‎config_sycl/plugin_interop_level_zero_buffer_multi_dim.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL/Plugin/interop-level-zero-buffer-multi-dim.cpp

‎config_sycl/plugin_interop_level_zero_buffer_ownership.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL/Plugin/interop-level-zero-buffer-ownership.cpp

‎config_sycl/plugin_interop_level_zero_get_native_mem.info

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL/Plugin/interop-level-zero-get-native-mem.cpp

‎llvm_test_suite_sycl.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,10 @@ Sources repo https://github.com/intel-innersource/applications.compilers.tests.l
624624
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_enqueue_arg_order_buffer" />
625625
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_enqueue_arg_order_image" />
626626
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero" />
627+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer" />
628+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer_multi_dim" />
629+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer_ownership" />
630+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_get_native_mem" />
627631
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_interop_task_mem" />
628632
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_keep_ownership" />
629633
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_thread" />

‎llvm_test_suite_sycl_esimd.xml

Lines changed: 52 additions & 32 deletions
Large diffs are not rendered by default.

‎llvm_test_suite_sycl_valgrind.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,10 @@ Sources repo https://github.com/intel-innersource/applications.compilers.tests.l
624624
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_enqueue_arg_order_buffer" />
625625
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_enqueue_arg_order_image" />
626626
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero" />
627+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer" />
628+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer_multi_dim" />
629+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_buffer_ownership" />
630+
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_get_native_mem" />
627631
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_interop_task_mem" />
628632
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_keep_ownership" />
629633
<test configFile="config_sycl/TEMPLATE_llvm_test_suite_sycl.xml" splitGroup="plugin" testName="plugin_interop_level_zero_thread" />

‎suite_generator_sycl.pl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ sub gen_suite
137137
if ($feature_folder eq "SYCL") {
138138
if ($subsuite ne "") {
139139
# For subsuite
140-
$xml->{files} = { file => [ { path => 'cmake'}, { path => 'tools'}, { path => 'CMakeLists.txt'}, { path => 'litsupport'}, { path => 'lit.cfg'}, { path => 'lit.site.cfg.in'}, { path => 'SYCL/CMakeLists.txt', dst => 'SYCL/CMakeLists.txt'}, { path => 'SYCL/lit.cfg.py', dst => 'SYCL/lit.cfg.py'}, {path => 'SYCL/lit.site.cfg.py.in', dst => 'SYCL/lit.site.cfg.py.in'}, {path => 'SYCL/helpers.hpp', dst => 'SYCL/helpers.hpp'}, {path => 'SYCL/External/CMakeLists.txt', dst => 'SYCL/External/CMakeLists.txt'}, {path => 'SYCL/ExtraTests/CMakeLists.txt', dst => 'SYCL/ExtraTests/CMakeLists.txt'}, { path => "SYCL/${subsuite}", dst => "SYCL/${subsuite}"}, { path => '$INFO_TDRIVE/ref/lit'}, { path => $config_folder}, { path => '.github/CODEOWNERS'}]};
140+
$xml->{files} = { file => [ { path => 'cmake'}, { path => 'tools'}, { path => 'CMakeLists.txt'}, { path => 'litsupport'}, { path => 'lit.cfg'}, { path => 'lit.site.cfg.in'}, { path => 'SYCL/CMakeLists.txt', dst => 'SYCL/CMakeLists.txt'}, { path => 'SYCL/lit.cfg.py', dst => 'SYCL/lit.cfg.py'}, {path => 'SYCL/lit.site.cfg.py.in', dst => 'SYCL/lit.site.cfg.py.in'}, {path => 'SYCL/helpers.hpp', dst => 'SYCL/helpers.hpp'}, {path => 'SYCL/External/CMakeLists.txt', dst => 'SYCL/External/CMakeLists.txt'}, {path => 'SYCL/ExtraTests/CMakeLists.txt', dst => 'SYCL/ExtraTests/CMakeLists.txt'}, { path => "SYCL/${subsuite}", dst => "SYCL/${subsuite}"}, {path => 'SYCL/include', dst => 'SYCL/include'}, { path => '$INFO_TDRIVE/ref/lit'}, { path => $config_folder}, { path => '.github/CODEOWNERS'}]};
141141
} else {
142142
$xml->{rules} = { advancedRule => [{ perfSupport => 'accurate'}]};
143143
$xml->{files} = { file => [ { path => 'cmake'}, { path => 'tools'}, { path => 'CMakeLists.txt'}, { path => 'litsupport'}, { path => 'lit.cfg'}, { path => 'lit.site.cfg.in'}, { path => 'SYCL'}, { path => '$INFO_TDRIVE/ref/lit'}, { path => $config_folder}, { path => '.github/CODEOWNERS'}, { path => 'setenv.list'}]};
@@ -187,6 +187,10 @@ sub gen_suite
187187
if ( @strings != 0 ) {
188188
@pre_xml = grep /testName="$testname"/, @strings;
189189
}
190+
if (-f "${config_folder}/$testname.xml") {
191+
push @{ $xml->{tests}{test}}, { configFile => "${config_folder}/$testname.xml", testName => $testname, splitGroup => $group};
192+
next;
193+
}
190194
if (@pre_xml != 0 and $pre_xml[0] =~ m/configFile="([^\s]*\.xml)"/) {
191195
$pre_xml_name = $1;
192196
my $pre_xml_file = basename($pre_xml_name);

0 commit comments

Comments
 (0)