Skip to content

Commit 411366a

Browse files
authored
Merge pull request intel#895 from myler/CMPLRTST-16192-xmain
CMPLRTST-16192: update test driver to support compile llvm_test_suite_esimd_embargo only
2 parents 3bd6749 + a5daabc commit 411366a

14 files changed

+38
-14
lines changed

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_1.info

Lines changed: 0 additions & 1 deletion
This file was deleted.

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_2.info

Lines changed: 0 additions & 1 deletion
This file was deleted.

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_3.info

Lines changed: 0 additions & 1 deletion
This file was deleted.

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_4.info

Lines changed: 0 additions & 1 deletion
This file was deleted.

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_5.info

Lines changed: 0 additions & 1 deletion
This file was deleted.

config_sycl_esimd_embargo/esimd_embargo_named_barriers_named_barrier_6.info

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_exec_in_order.cpp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_exec_in_order_branched.cpp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_multiple_wg.cpp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_single_barrier_in_loop.cpp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_single_wg.cpp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers/nb_various_num_of_barriers_in_loop.cpp

llvm_test_suite_esimd_embargo.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<description>Port of llvm_test_suite_esimd_embargo.
44
Suite is autogenerated by suite_generator_sycl.pl that you can find in the root dir of suite
55
Sources repo https://github.com/intel-innersource/applications.compilers.tests.llvm-project-llvm-test-suite
6-
Last Changed Revision: ef8d279737bdd77995b1d76880aca9fc7e86d505 Mon Dec 20 11:30:23 2021 +0300
76
</description>
87
<files>
98
<file path="cmake" />
@@ -14,10 +13,15 @@ Last Changed Revision: ef8d279737bdd77995b1d76880aca9fc7e86d505 Mon Dec 20 11
1413
<file path="lit.site.cfg.in" />
1514
<file path="SYCL" />
1615
<file path="SYCL_ESIMD_EMBARGO" />
16+
<file dst="SYCL_ESIMD_EMBARGO/include" path="SYCL/include" />
1717
<file path="$INFO_TDRIVE/ref/lit" />
1818
<file path="config_sycl_esimd_embargo" />
19+
<file path=".github/CODEOWNERS" />
1920
<file path="setenv.list" />
2021
</files>
22+
<rules>
23+
<advancedRule perfSupport="accurate" />
24+
</rules>
2125
<tests>
2226
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_api_fp_conversions_ats" />
2327
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_lsc_fence_pvc" />
@@ -30,12 +34,12 @@ Last Changed Revision: ef8d279737bdd77995b1d76880aca9fc7e86d505 Mon Dec 20 11
3034
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_lsc_lsc_slm_store_u32" />
3135
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_lsc_lsc_slm_store_u64" />
3236
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_lsc_lsc_slm_store_u8u32" />
33-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_1" />
34-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_2" />
35-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_3" />
36-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_4" />
37-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_5" />
38-
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_named_barrier_6" />
37+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_exec_in_order" />
38+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_exec_in_order_branched" />
39+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_multiple_wg" />
40+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_single_barrier_in_loop" />
41+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_single_wg" />
42+
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_named_barriers_nb_various_num_of_barriers_in_loop" />
3943
<test configFile="config_sycl_esimd_embargo/TEMPLATE_llvm_test_suite_esimd_embargo.xml" splitGroup="esimd" testName="esimd_embargo_sparsematrixmul_pvc_sparsematrixmul_pvc" />
4044
</tests>
4145
</suite>

llvm_test_suite_sycl.pl

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,11 @@ sub run_and_parse
419419
return $RUNFAIL;
420420
}
421421
}
422-
return $res;
422+
if ($res eq $RUNFAIL and $opt_compile) {
423+
return $COMPFAIL;
424+
} else {
425+
return $res;
426+
}
423427
} elsif ( -f $cmake_err) {
424428
$compiler_output = file2str($cmake_err);
425429
}
@@ -461,7 +465,16 @@ sub RunSuite
461465

462466
sub BuildTest
463467
{
468+
if ($opt_compile) {
469+
if ($current_test eq $test_to_run_list[0]) {
470+
init_and_cmake();
471+
} else {
472+
chdir_log($build_dir);
473+
}
474+
return run_and_parse();
475+
} else {
464476
return 0;
477+
}
465478
}
466479

467480
sub RunTest
@@ -605,6 +618,13 @@ sub do_run
605618
$backward_compatibility_opts = "-Dcompatibility_testing=1";
606619
}
607620

621+
if ($opt_compile and $current_suite eq "llvm_test_suite_esimd_embargo") {
622+
foreach my $test (@test_to_run_list) {
623+
modify_test_file($test, '%GPU_RUN_PLACEHOLDER', "true");
624+
modify_test_file($test, '%ESIMD_RUN_PLACEHOLDER', "true");
625+
}
626+
}
627+
608628
set_tool_path();
609629
if ($is_dynamic_suite == 1 or is_suite()) {
610630
execute("$python $lit -a $backward_compatibility_opts $gpu_opts $matrix $zedebug $jobset . $timeset > $run_all_lf 2>&1");

0 commit comments

Comments
 (0)