[SYCLomatic #1619] Updated 3 cases and removed 2 cases (#600)

Signed-off-by: Jiang, Zhiwei <[email protected]>

Author: zhiweij1

behavior_tests/behavior_tests.xml

@@ -87,7 +87,7 @@
         <test testName="bt-report-only" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-help" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-helper-function-dir" configFile="config/TEMPLATE_behavior_tests.xml" />
-        <!-- <test testName="bt-autocomplete" configFile="config/TEMPLATE_behavior_tests_lin.xml" /> -->
+        <test testName="bt-autocomplete" configFile="config/TEMPLATE_behavior_tests_lin.xml" />
         <test testName="bt-suppress-warnings-all" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-comments" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-stop-on-parse-err" configFile="config/TEMPLATE_behavior_tests.xml" />
@@ -115,17 +115,15 @@
         <test testName="ngt-assume-nd-range-dim" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-yaml-without-ct-version" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-yaml-with-different-ct-version" configFile="config/TEMPLATE_behavior_tests.xml" />
-        <!-- <test testName="bt-yaml-with-different-options1" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
-        <!-- <test testName="bt-yaml-with-different-options2" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
+        <test testName="bt-yaml-with-different-options1" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-yaml-with-different-options3" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="relative_path_test" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-explicit-namespace1" configFile="config/TEMPLATE_behavior_tests.xml" />
-        <!-- <test testName="ngt-invalid-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
+        <test testName="ngt-invalid-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-explicit-namespace3" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-use-explicit-namespace1" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-use-explicit-namespace2" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-use-explicit-namespace3" configFile="config/TEMPLATE_behavior_tests.xml" />
-        <!-- <test testName="bt-use-explicit-namespace4" configFile="config/TEMPLATE_behavior_tests.xml" /> -->
         <test testName="bt-use-explicit-namespace5" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-use-explicit-namespace6" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="bt-invalid-cuda-version" configFile="config/TEMPLATE_behavior_tests.xml" />

behavior_tests/src/bt-autocomplete/do_test.py

@@ -84,17 +84,16 @@ def migrate_test():
                 '-process-all\n'
     res = res and (reference == test_config.command_output)
 
-    call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#cl,sycl,")
-    reference = 'cl,sycl,cl\n' + \
-                'cl,sycl,dpct\n' + \
-                'cl,sycl,none\n' + \
-                'cl,sycl,sycl\n' + \
-                'cl,sycl,sycl-math\n'
+    call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#sycl,")
+    reference = 'sycl,dpct\n' + \
+                'sycl,none\n' + \
+                'sycl,sycl\n' + \
+                'sycl,sycl-math\n'
     res = res and (reference == test_config.command_output)
 
-    call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#cl,sycl,s")
-    reference = 'cl,sycl,sycl\n' + \
-                'cl,sycl,sycl-math\n'
+    call_subprocess(test_config.CT_TOOL + " --autocomplete=--usm-level=#none,restricted#--use-explicit-namespace=#sycl,s")
+    reference = 'sycl,sycl\n' + \
+                'sycl,sycl-math\n'
     res = res and (reference == test_config.command_output)
 
     call_subprocess(test_config.CT_TOOL + " --autocomplete=")
@@ -131,7 +130,6 @@ def migrate_test():
             '--in-root\n',
             '--in-root-exclude\n',
             '--keep-original-code\n',
-            '--no-cl-namespace-inline\n',
             '--no-dpcpp-extensions=\n',
             '--no-dry-pattern\n',
             '--no-incremental-migration\n',

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

@@ -18,11 +18,11 @@ def setup_test():
     return True
 
 def migrate_test():
-    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)
+    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)
     call_subprocess(test_config.CT_TOOL + " test.cu --out-root out --cuda-include-path=" + test_config.include_path)
     return is_sub_string("\"--analysis-scope-path=\"", test_config.command_output) and \
            is_sub_string("--always-use-async-handler --comments --compilation-database=\"", test_config.command_output) and \
-           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)
+           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)
 
 def build_test():
     return True

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

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