[hit] Rename RUN -> TEST & RUN_NAMED -> TEST_NAMED

Change-Id: I75e24f15129973cee15fc9dac65d678bd2172074

hipamd/tests/README.md

@@ -31,17 +31,17 @@ The parser looks for a code block similar to the one below.
 ```
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * //Small copy
- * RUN: %t -N 10    --memsetval 0x42
+ * TEST: %t -N 10    --memsetval 0x42
  * // Oddball size
- * RUN: %t -N 10013 --memsetval 0x5a
+ * TEST: %t -N 10013 --memsetval 0x5a
  * // Big copy
- * RUN: %t -N 256M  --memsetval 0xa6
+ * TEST: %t -N 256M  --memsetval 0xa6
  * HIT_END
  */
 ```
-In the above, BUILD commands provide instructions on how to build the test case while RUN commands provide instructions on how to execute the test case.
+In the above, BUILD commands provide instructions on how to build the test case while TEST commands provide instructions on how to execute the test case.
 
 #### BUILD command
 
@@ -57,21 +57,21 @@ NVCC_OPTIONS: All options specified after this delimiter are passed to hipcc on
 EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms.
 
 
-#### RUN command
+#### TEST command
 
-The supported syntax for the RUN command is:
+The supported syntax for the TEST command is:
 ```
-RUN: %t <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
+TEST: %t <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
 ```
 %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified.
-EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. Note that if the test has been excluded for a specific platform in the BUILD command, it is automatically excluded from the RUN command as well for the same platform.
+EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. Note that if the test has been excluded for a specific platform in the BUILD command, it is automatically excluded from the TEST command as well for the same platform.
 
 
-#### RUN_NAMED command
+#### TEST_NAMED command
 
-When using the RUN command, HIT will squash and append the arguments specified to the test executable name to generate the CMAKE test name. Sometimes we might want to specify a more descriptive name. The RUN_NAMED command is used for that. The supported syntax for the RUN_NAMED command is:
+When using the TEST command, HIT will squash and append the arguments specified to the test executable name to generate the CMAKE test name. Sometimes we might want to specify a more descriptive name. The TEST_NAMED command is used for that. The supported syntax for the TEST_NAMED command is:
 ```
-RUN: %t CMAKE_TEST_NAME <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
+TEST: %t CMAKE_TEST_NAME <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
 ```
 
 
@@ -111,7 +111,7 @@ Find the test and commandline that fail:
 
 (From the build directory, perhaps hip/build)
 grep -IR hipMemcpy-modes -IR ../tests/
-../tests/src/runtimeApi/memory/hipMemcpy.cpp: * RUN_NAMED: %t hipMemcpy-modes --tests 0x1
+../tests/src/runtimeApi/memory/hipMemcpy.cpp: * TEST_NAMED: %t hipMemcpy-modes --tests 0x1
 
 # Guidelines for adding new tests
 

hipamd/tests/hit/HIT.cmake

@@ -55,8 +55,8 @@ macro(PARSE_BUILD_COMMAND _target _sources _hipcc_options _hcc_options _nvcc_opt
     endforeach()
 endmacro()
 
-# Helper macro to parse RUN instructions
-macro(PARSE_RUN_COMMAND _target _arguments _exclude_platforms)
+# Helper macro to parse TEST instructions
+macro(PARSE_TEST_COMMAND _target _arguments _exclude_platforms)
     set(${_target})
     set(${_arguments} " ")
     set(${_exclude_platforms})
@@ -78,8 +78,8 @@ macro(PARSE_RUN_COMMAND _target _arguments _exclude_platforms)
     endforeach()
 endmacro()
 
-# Helper macro to parse RUN_NAMED instructions
-macro(PARSE_RUN_NAMED_COMMAND _target _testname _arguments _exclude_platforms)
+# Helper macro to parse TEST_NAMED instructions
+macro(PARSE_TEST_NAMED_COMMAND _target _testname _arguments _exclude_platforms)
     set(${_target})
     set(${_arguments} " ")
     set(${_exclude_platforms})
@@ -170,7 +170,7 @@ macro(HIT_ADD_FILES _dir _label _parent)
         endforeach()
 
         # Add tests
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --runCMDs ${file}
+        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --testCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}
@@ -178,7 +178,7 @@ macro(HIT_ADD_FILES _dir _label _parent)
         string(REGEX REPLACE "\n" ";" _contents "${_contents}")
         foreach(_cmd ${_contents})
             string(REGEX REPLACE " " ";" _cmd "${_cmd}")
-            parse_run_command(_target _arguments _exclude_platforms ${_cmd})
+            parse_test_command(_target _arguments _exclude_platforms ${_cmd})
             string(REGEX REPLACE "/" "." target ${_label}/${_target})
             read_from_map("_exclude" "${target}" _exclude_platforms_from_build)
             if(_exclude_platforms STREQUAL "all" OR _exclude_platforms STREQUAL ${HIP_PLATFORM} OR
@@ -189,7 +189,7 @@ macro(HIT_ADD_FILES _dir _label _parent)
         endforeach()
 
         # Add named tests
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --runNamedCMDs ${file}
+        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --testNamedCMDs ${file}
             OUTPUT_VARIABLE _contents
             ERROR_QUIET
             WORKING_DIRECTORY ${_dir}
@@ -197,7 +197,7 @@ macro(HIT_ADD_FILES _dir _label _parent)
         string(REGEX REPLACE "\n" ";" _contents "${_contents}")
         foreach(_cmd ${_contents})
             string(REGEX REPLACE " " ";" _cmd "${_cmd}")
-            parse_run_named_command(_target _testname _arguments _exclude_platforms ${_cmd})
+            parse_test_named_command(_target _testname _arguments _exclude_platforms ${_cmd})
             string(REGEX REPLACE "/" "." target ${_label}/${_target})
             read_from_map("_exclude" "${target}" _exclude_platforms_from_build)
             if(_exclude_platforms STREQUAL "all" OR _exclude_platforms STREQUAL ${HIP_PLATFORM} OR

hipamd/tests/hit/parser

@@ -8,7 +8,7 @@ use File::Spec;
 sub parse_file {
     my $file = shift;
     (my $exe = $file) =~ s/\.[^.]+$//g;
-    my (@buildCMDs, @runCMDs, @runNamedCMDs, @cmakeCMDs);
+    my (@buildCMDs, @testCMDs, @testNamedCMDs, @cmakeCMDs);
     if (open (SOURCE, '<:encoding(UTF-8)', "$file")) {
         while (<SOURCE>) {
             my $line=$_;
@@ -20,21 +20,21 @@ sub parse_file {
                 $line =~ s/\R//g;               # Remove line endings
                 push @buildCMDs, $line;
             }
-            # Look for RUN instructions
-            if ($line =~ /^ \* RUN:/) {
-                $line =~ s/^ \* RUN: //g;       # Remove " * RUN: "
+            # Look for TEST instructions
+            if ($line =~ /^ \* TEST:/) {
+                $line =~ s/^ \* TEST: //g;      # Remove " * TEST: "
                 $line =~ s/%s/$file/g;          # Substitute %s -> filename
                 $line =~ s/%t/$exe/g;           # Subsitute %t -> targetname
                 $line =~ s/\R//g;               # Remove line endings
-                push @runCMDs, $line;
+                push @testCMDs, $line;
             }
-            # Look for RUN_NAMED instructions
-            if ($line =~ /^ \* RUN_NAMED:/) {
-                $line =~ s/^ \* RUN_NAMED: //g; # Remove " * RUN_NAMED: "
+            # Look for TEST_NAMED instructions
+            if ($line =~ /^ \* TEST_NAMED:/) {
+                $line =~ s/^ \* TEST_NAMED: //g;# Remove " * TEST_NAMED: "
                 $line =~ s/%s/$file/g;          # Substitute %s -> filename
                 $line =~ s/%t/$exe/g;           # Subsitute %t -> targetname
                 $line =~ s/\R//g;               # Remove line endings
-                push @runNamedCMDs, $line;
+                push @testNamedCMDs, $line;
             }
             # Look for CMAKECMD instructions
             if ($line =~ /^ \* CMAKECMD:/) {
@@ -46,7 +46,7 @@ sub parse_file {
         }
         close(SOURCE);
     }
-    return (\@buildCMDs, \@runCMDs, \@runNamedCMDs, \@cmakeCMDs);
+    return (\@buildCMDs, \@testCMDs, \@testNamedCMDs, \@cmakeCMDs);
 }
 
 # Exit if no arguments specified
@@ -58,21 +58,21 @@ if(scalar @ARGV == 0){
 # Parse command
 my @options = ();
 my $retBuildCMDs = 0;
-my $retRunCMDs = 0;
-my $retRunNamedCMDs = 0;
+my $retTestCMDs = 0;
+my $retTestNamedCMDs = 0;
 my $retCmakeCMDs = 0;
 foreach $arg (@ARGV) {
-    if ($retBuildCMDs or $retRunCMDs or $retRunNamedCMDs or $retCmakeCMDs) {
+    if ($retBuildCMDs or $retTestCMDs or $retTestNamedCMDs or $retCmakeCMDs) {
         push (@options, $arg);
     }
     if ($arg eq '--buildCMDs') {
         $retBuildCMDs = 1;
     }
-    if ($arg eq '--runCMDs') {
-        $retRunCMDs = 1;
+    if ($arg eq '--testCMDs') {
+        $retTestCMDs = 1;
     }
-    if ($arg eq '--runNamedCMDs') {
-        $retRunNamedCMDs = 1;
+    if ($arg eq '--testNamedCMDs') {
+        $retTestNamedCMDs = 1;
     }
     if ($arg eq '--cmakeCMDs') {
         $retCmakeCMDs = 1;
@@ -80,26 +80,26 @@ foreach $arg (@ARGV) {
 }
 
 # Atleast one command needs to be specified
-if (($retBuildCMDs eq 0) and ($retRunCMDs eq 0) and ($retRunNamedCMDs eq 0) and ($retCmakeCMDs eq 0)) {
-    die "Usage: $0 <--buildCMDs|--runCMDs|--runNamedCMDs|--cmakeCMDs> FILENAMEs\n";
+if (($retBuildCMDs eq 0) and ($retTestCMDs eq 0) and ($retTestNamedCMDs eq 0) and ($retCmakeCMDs eq 0)) {
+    die "Usage: $0 <--buildCMDs|--testCMDs|--testNamedCMDs|--cmakeCMDs> FILENAMEs\n";
 }
 
 # Iterate over input files
 foreach $file (@options) {
     # Convert absolute path to path relative to working directory
     my $relfile = File::Spec->abs2rel($file);
-    my ($buildCMDs, $runCMDs, $runNamedCMDs, $cmakeCMDs) = parse_file("$relfile");
+    my ($buildCMDs, $testCMDs, $testNamedCMDs, $cmakeCMDs) = parse_file("$relfile");
     if ($retBuildCMDs) {
         # print "BuildCMDs:\n";
         print "$_\n" for @$buildCMDs;
     }
-    if ($retRunCMDs) {
-        # print "RunCMDs:\n";
-        print "$_\n" for @$runCMDs;
+    if ($retTestCMDs) {
+        # print "TestCMDs:\n";
+        print "$_\n" for @$testCMDs;
     }
-    if ($retRunNamedCMDs) {
-        # print "RunNamedCMDs:\n";
-        print "$_\n" for @$runNamedCMDs;
+    if ($retTestNamedCMDs) {
+        # print "TestNamedCMDs:\n";
+        print "$_\n" for @$testNamedCMDs;
     }
     if ($retCmakeCMDs) {
         # print "CmakeCMDs:\n";

hipamd/tests/src/Functional/device/hipFuncDeviceSynchronize.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/Functional/device/hipFuncGetDevice.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/Functional/device/hipFuncSetDevice.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t EXCLUDE_HIP_PLATFORM
+ * TEST: %t EXCLUDE_HIP_PLATFORM
  * HIT_END
  */
 

hipamd/tests/src/Functional/device/hipFuncSetDeviceFlags.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/compiler/hipClassKernel.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 #include "hipClassKernel.h"

hipamd/tests/src/context/hipCtx_simple.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/context/hipMemsetD8.cpp

@@ -24,13 +24,13 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * //Small copy
- * RUN: %t -N 10    --memsetval 0x42
+ * TEST: %t -N 10    --memsetval 0x42
  * // Oddball size
- * RUN: %t -N 10013 --memsetval 0x5a
+ * TEST: %t -N 10013 --memsetval 0x5a
  * // Big copy
- * RUN: %t -N 256M  --memsetval 0xa6
+ * TEST: %t -N 256M  --memsetval 0xa6
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipAsynchronousStreams.cpp

@@ -20,7 +20,7 @@ THE SOFTWARE.
 /*
  * HIT_START
  * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipDeviceMalloc.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 /* HIT_START
  * BUILD: %t %s NVCC_OPTIONS -std=c++11
- * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
 #include "test_common.h"

hipamd/tests/src/deviceLib/hipDeviceMemcpy.cpp

@@ -9,7 +9,7 @@
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipDoublePrecisionIntrinsics.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipDoublePrecisionMathDevice.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipDoublePrecisionMathHost.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipFloatMath.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipFloatMathPrecise.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipIntegerIntrinsics.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipMathFunctions.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipSimpleAtomicsTest.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipSinglePrecisionIntrinsics.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipSinglePrecisionMathDevice.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipSinglePrecisionMathHost.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipStdComplex.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 /* HIT_START
  * BUILD: %t %s NVCC_OPTIONS -std=c++11
- * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
 #include "test_common.h"

hipamd/tests/src/deviceLib/hipTestClock.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestDevice.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestDeviceDouble.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * XXBUILD: %t %s ../test_common.cpp
- * XXRUN: %t
+ * XXTEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestDotFunctions.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestFMA.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestHalf.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestIncludeMath.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestNativeHalf.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipTestNew.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipThreadFence.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipVectorTypes.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hipVectorTypesDevice.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_anyall.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_ballot.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_bitextract.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_bitinsert.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_brev.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_clz.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_ffs.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_mbcnt.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_popc.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_test_ldg.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_threadfence_system.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/deviceLib/hip_trig.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/hipC.c

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/hipEnvVarDriver.cpp

@@ -17,7 +17,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 /* HIT_START
  * BUILD: %t %s test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/hipHcc.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s
- * RUN: %t EXCLUDE_HIP_PLATFORM all
+ * TEST: %t EXCLUDE_HIP_PLATFORM all
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipDynamicShared.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
- * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipDynamicShared2.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
- * RUN: %t EXCLUDE_HIP_PLATFORM nvcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipEmptyKernel.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipGridLaunch.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipLanguageExtensions.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipLaunchParm.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipLaunchParmFunctor.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -O3
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipPrintfKernel.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipTestConstant.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipTestGlobalVariable.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipTestMallocKernel.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/hipTestMemKernel.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/kernel/inline_asm_vadd.cpp

@@ -17,7 +17,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 /* HIT_START
  * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp

@@ -24,9 +24,9 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t EXCLUDE_HIP_PLATFORM hcc
- * RUN: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc
- * RUN: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc
+ * TEST: %t EXCLUDE_HIP_PLATFORM hcc
+ * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc
+ * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipChooseDevice.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceComputeCapability.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceGetByPCIBusId.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceGetName.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceGetPCIBusId.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceSynchronize.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipDeviceTotalMem.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipGetDevice.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipGetDeviceAttribute.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipRuntimeGetVersion.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipSetCachceConfig.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipSetDevice.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t EXCLUDE_HIP_PLATFORM
+ * TEST: %t EXCLUDE_HIP_PLATFORM
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/device/hipSetDeviceFlags.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/error/hipPeekAtLastError.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/event/hipEventRecord.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t --iterations 10
+ * TEST: %t --iterations 10
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/event/record_event.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipArray.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipHostGetFlags.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipHostMalloc.cpp

@@ -22,7 +22,7 @@
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMallocManaged.cpp

@@ -4,7 +4,7 @@
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t -N 256M
+ * TEST: %t -N 256M
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemPtrGetInfo.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpy.cpp

@@ -22,11 +22,11 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN_NAMED: %t hipMemcpy-modes --tests 0x1
- * RUN_NAMED: %t hipMemcpy-size --tests 0x6
- * RUN_NAMED: %t hipMemcpy-dev-offsets --tests 0x10
- * RUN_NAMED: %t hipMemcpy-host-offsets --tests 0x20
- * RUN_NAMED: %t hipMemcpy-multithreaded --tests 0x8
+ * TEST_NAMED: %t hipMemcpy-modes --tests 0x1
+ * TEST_NAMED: %t hipMemcpy-size --tests 0x6
+ * TEST_NAMED: %t hipMemcpy-dev-offsets --tests 0x10
+ * TEST_NAMED: %t hipMemcpy-host-offsets --tests 0x20
+ * TEST_NAMED: %t hipMemcpy-multithreaded --tests 0x8
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp  EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp

@@ -22,8 +22,8 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
- * RUN_NAMED: %t hipMemcpyAsync-simple --async
+ * TEST: %t
+ * TEST_NAMED: %t hipMemcpyAsync-simple --async
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp

@@ -17,7 +17,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemset.cpp

@@ -24,13 +24,13 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * //Small copy
- * RUN: %t -N 10    --memsetval 0x42 --memsetD32val 0x101
+ * TEST: %t -N 10    --memsetval 0x42 --memsetD32val 0x101
  * // Oddball size
- * RUN: %t -N 10013 --memsetval 0x5a --memsetD32val 0xDEADBEEF
+ * TEST: %t -N 10013 --memsetval 0x5a --memsetD32val 0xDEADBEEF
  * // Big copy
- * RUN: %t -N 256M  --memsetval 0xa6 --memsetD32val 0xCAFEBABE
+ * TEST: %t -N 256M  --memsetval 0xa6 --memsetD32val 0xCAFEBABE
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */
 

hipamd/tests/src/runtimeApi/memory/hipRandomMemcpyAsync.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp
- * RUN: %t
+ * TEST: %t
  * HIT_END
  */