Merge pull request #1094 from mangupta/hit_improvements

[dtests] Add new tests to directed tests
2019-05-12 19:25:21 +05:30
commit 0cc7fe8a9f
@@ -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,36 +57,38 @@ 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
+#### BUILD_CMD command

-The supported syntax for the RUN command is:
+The supported syntax for the BUILD_CMD command is:
 ```
-RUN: %t <arguments_to_test_executable> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
+BUILD_CMD: <targetname> <build_command> EXCLUDE_HIP_PLATFORM <hcc|nvcc|all>
+```
+%s: refers to current source file name. Additional source files needed for the test can be specified by name (including relative path).
+%t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified.
+%hc: refers to hipcc pointed to by $CMAKE_INSTALL_PREFIX/bin/hipcc.
+%cc: refers to system c compiler pointed to by $CC.
+%S: refers to path to current source file.
+%T: refers to path to current build target.
+
+
+#### TEST command
+
+The supported syntax for the TEST command is:
+```
+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>
 ```


-#### CMAKECMD command
-
-The supported syntax for the CMAKECMD command is:
-```
-CMAKECMD: <cmake_command> <options_to_cmake_command>
-```
-cmake_command: refers to any of the commands supported by ```cmake -E``` as specified in the [cmake documentation](https://cmake.org/cmake/help/latest/manual/cmake.1.html#command-line-tool-mode). Note that the commands are limited by the version of cmake the user is running.
-options_to_cmake_command: refers to the arguments supported by the specific cmake_command. The arguments are parsed by HIT to replace special markers. The markers supported by HIT are:
-%S: Refers to the source directory containing the current source file.
-%B: Refers to the build directory for the current cmake project i.e. CMAKE_CURRENT_BINARY_DIR.
-
-
 ### Running tests:
 ```
 ctest
@@ -111,7 +113,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

@@ -55,8 +55,31 @@ 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 CUSTOM BUILD instructions
+macro(PARSE_CUSTOMBUILD_COMMAND _target _buildcmd _exclude_platforms)
+    set(${_target})
+    set(${_buildcmd} " ")
+    set(${_exclude_platforms})
+    set(_target_found FALSE)
+    set(_exclude_platforms_found FALSE)
+    foreach(arg ${ARGN})
+        if(NOT _target_found)
+            set(_target_found TRUE)
+            set(${_target} ${arg})
+        elseif("x${arg}" STREQUAL "xEXCLUDE_HIP_PLATFORM")
+            set(_exclude_platforms_found TRUE)
+        else()
+            if(_exclude_platforms_found)
+                set(${_exclude_platforms} ${arg})
+            else()
+                list(APPEND ${_buildcmd} ${arg})
+            endif()
+        endif()
+    endforeach()
+endmacro()
+
+# Helper macro to parse TEST instructions
+macro(PARSE_TEST_COMMAND _target _arguments _exclude_platforms)
    set(${_target})
    set(${_arguments} " ")
    set(${_exclude_platforms})
@@ -78,8 +101,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})
@@ -155,22 +178,35 @@ macro(HIT_ADD_FILES _dir _label _parent)
            endif()
        endforeach()

-        # Run cmake commands
-        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --cmakeCMDs ${file}
+        # Custom build commands
+        execute_process(COMMAND ${HIP_SRC_PATH}/tests/hit/parser --customBuildCMDs ${file}
            OUTPUT_VARIABLE _contents
            ERROR_QUIET
            WORKING_DIRECTORY ${_dir}
            OUTPUT_STRIP_TRAILING_WHITESPACE)
        string(REGEX REPLACE "\n" ";" _contents "${_contents}")
+        string(REGEX REPLACE "%hc" "${HIP_HIPCC_EXECUTABLE}" _contents "${_contents}")
+        string(REGEX REPLACE "%cc" "${CC}" _contents "${_contents}")
        string(REGEX REPLACE "%S" ${_dir} _contents "${_contents}")
-        string(REGEX REPLACE "%B" ${CMAKE_CURRENT_BINARY_DIR} _contents "${_contents}")
+        string(REGEX REPLACE "%T" ${_label} _contents "${_contents}")
        foreach(_cmd ${_contents})
            string(REGEX REPLACE " " ";" _cmd "${_cmd}")
-            execute_process(COMMAND ${CMAKE_COMMAND} -E ${_cmd})
+            parse_custombuild_command(_target _buildcmd _exclude_platforms ${_cmd})
+            string(REGEX REPLACE "/" "." target ${_label}/${_target})
+            insert_into_map("_exclude" "${target}" "${_exclude_platforms}")
+            if(_exclude_platforms STREQUAL "all" OR _exclude_platforms STREQUAL ${HIP_PLATFORM})
+            else()
+                string(REGEX REPLACE ";" " " _buildcmd "${_buildcmd}")
+                #string(CONCAT buildscript ${CMAKE_CURRENT_BINARY_DIR}/${target} ".sh")
+                #file(WRITE ${buildscript} ${_buildcmd})
+                #add_custom_target(${target} COMMAND ${buildscript})
+                add_custom_target(${target} COMMAND sh -c "${_buildcmd}")
+                add_dependencies(${_parent} ${target})
+            endif()
        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 +214,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 +225,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 +233,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
@@ -4,49 +4,57 @@ use 5.006; use v5.10.1;
 use File::Basename;
 use File::Spec;

+my $patBUILD = "^".quotemeta(" * BUILD:");
+my $patTEST = "^".quotemeta(" * TEST:");
+my $patTEST_NAMED = "^".quotemeta(" * TEST_NAMED:");
+my $patBUILD_CMD = "^".quotemeta(" * BUILD_CMD:");
+
 # Scan input file for HIT information
 sub parse_file {
    my $file = shift;
    (my $exe = $file) =~ s/\.[^.]+$//g;
-    my (@buildCMDs, @runCMDs, @runNamedCMDs, @cmakeCMDs);
+    my (@buildCMDs, @testCMDs, @testNamedCMDs, @customBuildCMDs);
    if (open (SOURCE, '<:encoding(UTF-8)', "$file")) {
        while (<SOURCE>) {
            my $line=$_;
            # Look for BUILD instructions
-            if ($line =~ /^ \* BUILD:/) {
+            if ($line =~ /$patBUILD/) {
                $line =~ s/^ \* BUILD: //g;     # Remove " * BUILD: "
                $line =~ s/%s/$file/g;          # Substitute %s -> filename
                $line =~ s/%t/$exe/g;           # Substitute %t -> targetname
                $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 =~ /$patTEST/) {
+                $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 =~ /$patTEST_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:/) {
-                $line =~ s/^ \* CMAKECMD: //g;  # Remove " * CMAKECMD: "
-                # Substitute %S -> srcdir and %B -> builddir happens in cmake
+            # Look for BUILD_CMD instructions
+            if ($line =~ /$patBUILD_CMD/) {
+                $line =~ s/^ \* BUILD_CMD: //g; # Remove " * BUILD_CMD: "
+                $line =~ s/%s/$file/g;          # Substitute %s -> filename
+                $line =~ s/%t/$exe/g;           # Substitute %t -> targetname
+                # Substitute %hc -> /path/to/hipcc and %cc -> /path/to/cc happens in cmake
+                # Substitute %S -> src dir and %T -> target build dir happens in cmake
                $line =~ s/\R//g;               # Remove line endings
-                push @cmakeCMDs, $line;
+                push @customBuildCMDs, $line;
            }
        }
        close(SOURCE);
    }
-    return (\@buildCMDs, \@runCMDs, \@runNamedCMDs, \@cmakeCMDs);
+    return (\@buildCMDs, \@testCMDs, \@testNamedCMDs, \@customBuildCMDs);
 }

 # Exit if no arguments specified
@@ -58,52 +66,52 @@ if(scalar @ARGV == 0){
 # Parse command
 my @options = ();
 my $retBuildCMDs = 0;
-my $retRunCMDs = 0;
-my $retRunNamedCMDs = 0;
-my $retCmakeCMDs = 0;
+my $retTestCMDs = 0;
+my $retTestNamedCMDs = 0;
+my $retCustomBuildCMDs = 0;
 foreach $arg (@ARGV) {
-    if ($retBuildCMDs or $retRunCMDs or $retRunNamedCMDs or $retCmakeCMDs) {
+    if ($retBuildCMDs or $retTestCMDs or $retTestNamedCMDs or $retCustomBuildCMDs) {
        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;
+    if ($arg eq '--customBuildCMDs') {
+        $retCustomBuildCMDs = 1;
    }
 }

 # 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($retCustomBuildCMDs eq 0)) {
+    die "Usage: $0 <--buildCMDs|--testCMDs|--testNamedCMDs|--customBuildCMDs> 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, $customBuildCMDs) = 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";
-        print "$_\n" for @$cmakeCMDs;
+    if ($retCustomBuildCMDs) {
+        # print "CustomBuildCMDs:\n";
+        print "$_\n" for @$customBuildCMDs;
    }
 }

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -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
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

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

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

@@ -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
 */

@@ -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
 */

@@ -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"
@@ -9,7 +9,7 @@

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -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"
@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * XXBUILD: %t %s ../test_common.cpp
- * XXRUN: %t
+ * XXTEST: %t
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

@@ -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
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -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
 */

@@ -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
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -20,13 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-/**
- * Build the test:
- * hipcc complex_loading_behavior.cpp -o libfoo.so -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY
- * hipcc complex_loading_behavior.cpp -o complex_loading_behavior -ldl
- *
- * Run the test:
- * ./complex_loading_behavior
+/* HIT_START
+ * BUILD_CMD: libfoo %hc %S/%s -o libfoo.so -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY
+ * BUILD_CMD: %t %hc %S/%s -o %T/%t -ldl
+ * TEST: %t
+ * HIT_END
 */

 #if !defined(TEST_SHARED_LIBRARY)
@@ -93,8 +91,7 @@ int launch_local_kernel() {
    free(B_h);
    free(C_h);

-    std::cout << "local launch succedded\n";
-
+    std::cout << "PASSED!\n";
    return 0;
 }

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

@@ -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
 */

@@ -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
 */

@@ -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
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -23,7 +23,7 @@ THE SOFTWARE.

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

@@ -23,7 +23,7 @@ THE SOFTWARE.

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

@@ -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
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -O3
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -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
 */

@@ -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
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -23,7 +23,7 @@ THE SOFTWARE.

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

@@ -26,7 +26,7 @@ THE SOFTWARE.

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -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
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -25,7 +25,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../../test_common.cpp
- * RUN: %t --iterations 10
+ * TEST: %t --iterations 10
 * HIT_END
 */

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM all
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -22,7 +22,7 @@ THE SOFTWARE.

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

@@ -22,7 +22,7 @@

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

@@ -19,7 +19,7 @@ THE SOFTWARE.

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

@@ -4,7 +4,7 @@

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

@@ -22,7 +22,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

@@ -25,7 +25,7 @@ THE SOFTWARE.

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

@@ -25,7 +25,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -25,7 +25,7 @@ THE SOFTWARE.

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

@@ -25,7 +25,7 @@ THE SOFTWARE.

 /* HIT_START
 * BUILD: %t %s ../../test_common.cpp  EXCLUDE_HIP_PLATFORM nvcc
- * RUN: %t
+ * TEST: %t
 * HIT_END
 */

@@ -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
 */

@@ -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
 */

@@ -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
 */

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.

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

--- a/Ver más
+++ b/Ver más