EXSWCPHIPT-125 - Add tests for hipGetDeviceCount and restructure some SpawnProc tests (#2765)

catch/unit/printf/CMakeLists.txt

@@ -16,3 +16,10 @@ elseif (HIP_PLATFORM MATCHES "nvidia")
                     TEST_TARGET_NAME build_tests
                     COMPILE_OPTIONS -std=c++17)
 endif()
+
+# Standalone exes
+add_executable(printfFlags EXCLUDE_FROM_ALL printfFlags_exe.cc)
+add_executable(printfSpecifiers EXCLUDE_FROM_ALL printfSpecifiers_exe.cc)
+
+add_dependencies(printfTests printfFlags)
+add_dependencies(printfTests printfSpecifiers)

catch/unit/printf/printfFlags.cc

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,20 +23,6 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_process.hh>
 
-__global__ void test_kernel() {
-  printf("%08d\n", 42);
-  printf("%08i\n", -42);
-  printf("%08u\n", 42);
-  printf("%08g\n", 123.456);
-  printf("%0+8d\n", 42);
-  printf("%+d\n", -42);
-  printf("%+08d\n", 42);
-  printf("%-8s\n", "xyzzy");
-  printf("% i\n", -42);
-  printf("%-16.8d\n", 42);
-  printf("%16.8d\n", 42);
-}
-
 TEST_CASE("Unit_printf_flags") {
   std::string reference(R"here(00000042
 -0000042
@@ -51,7 +37,7 @@ xyzzy
         00000042
 )here");
 
-  hip::SpawnProc proc("printfExe/printfFlags", true);
+  hip::SpawnProc proc("printfFlags", true);
   REQUIRE(proc.run() == 0);
   REQUIRE(proc.getOutput() == reference);
 }

catch/unit/printf/printfFlags_exe.cc

@@ -0,0 +1,42 @@
+/*
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <hip/hip_runtime.h>
+
+__global__ void test_kernel() {
+  printf("%08d\n", 42);
+  printf("%08i\n", -42);
+  printf("%08u\n", 42);
+  printf("%08g\n", 123.456);
+  printf("%0+8d\n", 42);
+  printf("%+d\n", -42);
+  printf("%+08d\n", 42);
+  printf("%-8s\n", "xyzzy");
+  printf("% i\n", -42);
+  printf("%-16.8d\n", 42);
+  printf("%16.8d\n", 42);
+}
+
+int main() {
+  test_kernel<<<1, 1>>>();
+  static_cast<void>(hipDeviceSynchronize());
+}

catch/unit/printf/printfSpecifiers.cc

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -89,7 +89,7 @@ x
 )here");
 #endif
 
-  hip::SpawnProc proc("printfExe/printfSepcifiers", true);
+  hip::SpawnProc proc("printfSpecifiers", true);
   REQUIRE(0 == proc.run());
   REQUIRE(proc.getOutput() == reference);
 }

catch/unit/printf/printfSpecifiers_exe.cc

@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <hip/hip_runtime.h>
+
+__global__ void test_kernel() {
+  const char* N = nullptr;
+  const char* s = "hello world";
+  printf("xyzzy\n");
+  printf("%%\n");
+  printf("hello %% world\n");
+  printf("%%s\n");
+  // Two special tests to make sure that the compiler pass correctly
+  // skips over a '%%' without affecting the logic for locating
+  // string arguments.
+  printf("%%s%p\n", (void*)0xf01dab1eca55e77e);
+  printf("%%c%s\n", "xyzzy");
+  printf("%c%c%c\n", 's', 'e', 'p');
+  printf("%d\n", -42);
+  printf("%u\n", 42);
+  printf("%f\n", 123.456);
+#ifdef __HIP_PLATFORM_AMD__
+  printf("%F\n", -123.456);
+#else
+  printf("%f\n", -123.456);
+#endif
+  printf("%e\n", -123.456);
+  printf("%E\n", 123.456);
+  printf("%g\n", 123.456);
+  printf("%G\n", -123.456);
+  printf("%c\n", 'x');
+  printf("%s\n", N);
+  printf("%p\n", (void *)N);
+#ifdef __HIP_PLATFORM_AMD__
+  printf("%.*f %*.*s %p\n", 8, 3.14159, 8, 5, s, (void*)0xf01dab1eca55e77e);
+#else
+  // In Cuda, printf doesn't support %.*, %*.*
+  printf("%.8f %8.5s %p\n", 3.14159, s, (void*)0xf01dab1eca55e77e);
+#endif
+}
+
+int main() {
+  test_kernel<<<1, 1>>>();
+  static_cast<void>(hipDeviceSynchronize());
+  return 0;
+}