Skip to content

Commit 7c1f947

Browse files
zhiweij1TejaX-Alaghari
zhiweij1
authored and
TejaX-Alaghari
committed
[SYCLomatic #1619] Updated 3 cases and removed 2 cases (#600)
Signed-off-by: Jiang, Zhiwei <zhiwei.jiang@intel.com>
1 parent a2c3283 commit 7c1f947

8 files changed

Lines changed: 14 additions & 134 deletions

File tree

‎behavior_tests/behavior_tests.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<test testName="bt-report-only" configFile="config/TEMPLATE_behavior_tests.xml" />
8888
<test testName="bt-help" configFile="config/TEMPLATE_behavior_tests.xml" />
8989
<test testName="bt-helper-function-dir" configFile="config/TEMPLATE_behavior_tests.xml" />
90-
<!-- <test testName="bt-autocomplete" configFile="config/TEMPLATE_behavior_tests_lin.xml" /> -->
90+
<test testName="bt-autocomplete" configFile="config/TEMPLATE_behavior_tests_lin.xml" />
9191
<test testName="bt-suppress-warnings-all" configFile="config/TEMPLATE_behavior_tests.xml" />
9292
<test testName="bt-comments" configFile="config/TEMPLATE_behavior_tests.xml" />
9393
<test testName="bt-stop-on-parse-err" configFile="config/TEMPLATE_behavior_tests.xml" />
@@ -115,17 +115,15 @@
115115
<test testName="ngt-assume-nd-range-dim" configFile="config/TEMPLATE_behavior_tests.xml" />
116116
<test testName="bt-yaml-without-ct-version" configFile="config/TEMPLATE_behavior_tests.xml" />
117117
<test testName="bt-yaml-with-different-ct-version" configFile="config/TEMPLATE_behavior_tests.xml" />
118-
<!-- <test testName="bt-yaml-with-different-options1" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
119-
<!-- <test testName="bt-yaml-with-different-options2" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
118+
<test testName="bt-yaml-with-different-options1" configFile="config/TEMPLATE_behavior_tests.xml" />
120119
<test testName="bt-yaml-with-different-options3" configFile="config/TEMPLATE_behavior_tests.xml" />
121120
<test testName="relative_path_test" configFile="config/TEMPLATE_behavior_tests.xml" />
122121
<test testName="ngt-invalid-explicit-namespace1" configFile="config/TEMPLATE_behavior_tests.xml" />
123-
<!-- <test testName="ngt-invalid-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
122+
<test testName="ngt-invalid-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" />
124123
<test testName="ngt-invalid-explicit-namespace3" configFile="config/TEMPLATE_behavior_tests.xml" />
125124
<test testName="bt-use-explicit-namespace1" configFile="config/TEMPLATE_behavior_tests.xml" />
126125
<test testName="bt-use-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" />
127126
<test testName="bt-use-explicit-namespace3" configFile="config/TEMPLATE_behavior_tests.xml" />
128-
<!-- <test testName="bt-use-explicit-namespace4" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
129127
<test testName="bt-use-explicit-namespace5" configFile="config/TEMPLATE_behavior_tests.xml" />
130128
<test testName="bt-use-explicit-namespace6" configFile="config/TEMPLATE_behavior_tests.xml" />
131129
<test testName="bt-invalid-cuda-version" configFile="config/TEMPLATE_behavior_tests.xml" />

‎behavior_tests/src/bt-autocomplete/do_test.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,16 @@ def migrate_test():
8484
'-process-all\n'
8585
res = res and (reference == test_config.command_output)
8686

87-
call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#cl,sycl,")
88-
reference = 'cl,sycl,cl\n' + \
89-
'cl,sycl,dpct\n' + \
90-
'cl,sycl,none\n' + \
91-
'cl,sycl,sycl\n' + \
92-
'cl,sycl,sycl-math\n'
87+
call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#sycl,")
88+
reference = 'sycl,dpct\n' + \
89+
'sycl,none\n' + \
90+
'sycl,sycl\n' + \
91+
'sycl,sycl-math\n'
9392
res = res and (reference == test_config.command_output)
9493

95-
call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#cl,sycl,s")
96-
reference = 'cl,sycl,sycl\n' + \
97-
'cl,sycl,sycl-math\n'
94+
call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#sycl,s")
95+
reference = 'sycl,sycl\n' + \
96+
'sycl,sycl-math\n'
9897
res = res and (reference == test_config.command_output)
9998

10099
call_subprocess(test_config.CT_TOOL + " --autocomplete=")
@@ -131,7 +130,6 @@ def migrate_test():
131130
'--in-root\n',
132131
'--in-root-exclude\n',
133132
'--keep-original-code\n',
134-
'--no-cl-namespace-inline\n',
135133
'--no-dpcpp-extensions=\n',
136134
'--no-dry-pattern\n',
137135
'--no-incremental-migration\n',

‎behavior_tests/src/bt-use-explicit-namespace4/do_test.py‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎behavior_tests/src/bt-use-explicit-namespace4/vector_add.cu‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎behavior_tests/src/bt-yaml-with-different-options1/do_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ def setup_test():
1818
return True
1919

2020
def migrate_test():
21-
call_subprocess(test_config.CT_TOOL + " test.cu --in-root . --out-root out --always-use-async-handler --assume-nd-range-dim=1 --comments --enable-ctad --no-dpcpp-extensions=enqueued_barriers --no-dry-pattern --process-all -p . --sycl-named-lambda --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=cl,dpct --usm-level=none --cuda-include-path=" + test_config.include_path)
21+
call_subprocess(test_config.CT_TOOL + " test.cu --in-root . --out-root out --always-use-async-handler --assume-nd-range-dim=1 --comments --enable-ctad --no-dpcpp-extensions=enqueued_barriers --no-dry-pattern --process-all -p . --sycl-named-lambda --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=sycl,dpct --usm-level=none --cuda-include-path=" + test_config.include_path)
2222
call_subprocess(test_config.CT_TOOL + " test.cu --out-root out --cuda-include-path=" + test_config.include_path)
2323
return is_sub_string("\"--analysis-scope-path=\"", test_config.command_output) and \
2424
is_sub_string("--always-use-async-handler --comments --compilation-database=\"", test_config.command_output) and \
25-
is_sub_string("--enable-ctad --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=cl,dpct --no-dpcpp-extensions=enqueued_barriers --assume-nd-range-dim=1 --no-dry-pattern --process-all --sycl-named-lambda --usm-level=none\".", test_config.command_output)
25+
is_sub_string("--enable-ctad --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=sycl,dpct --no-dpcpp-extensions=enqueued_barriers --assume-nd-range-dim=1 --no-dry-pattern --process-all --sycl-named-lambda --usm-level=none\".", test_config.command_output)
2626

2727
def build_test():
2828
return True

‎behavior_tests/src/bt-yaml-with-different-options2/do_test.py‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎behavior_tests/src/bt-yaml-with-different-options2/test.cu‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎behavior_tests/src/ngt-invalid-explicit-namespace2/do_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup_test():
1818
return True
1919

2020
def migrate_test():
21-
call_subprocess(test_config.CT_TOOL + " --use-explicit-namespace=sycl,cl,dpct vector_add.cu --cuda-include-path=" + test_config.include_path)
21+
call_subprocess(test_config.CT_TOOL + " --use-explicit-namespace=sycl,dpct,none vector_add.cu --cuda-include-path=" + test_config.include_path)
2222
return is_sub_string("Error: The input for option --use-explicit-namespace is not valid.", test_config.command_output)
2323

2424

0 commit comments

Comments
 (0)