Re-enable OpenMP target and testing (#126)

* Re-enable OpenMP target and testing

* Enable openmp target tests on mi200 jobs

* Fix direct self-inclusion of header file

* Enable openmp-target testing on vega20

---------

Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>
Co-authored-by: Welton, Benjamin <Benjamin.Welton@amd.com>

.github/workflows/continuous_integration.yml

@@ -32,7 +32,7 @@ env:
   navi4_EXCLUDE_TESTS_REGEX: "^(test-page-migration-(execute|validate))$"
   navi3_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling|openmp-target)$"
   vega20_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling|openmp-target)$"
-  mi200_EXCLUDE_LABEL_REGEX: "^(openmp-target)$"
+  mi200_EXCLUDE_LABEL_REGEX: ""
   mi300_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling)$"
   mi300a_EXCLUDE_LABEL_REGEX: ""
   mi325_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling)$"

cmake/rocprofiler_config_install_roctx.cmake

@@ -57,10 +57,8 @@ set(${PACKAGE_NAME}_BUILD_TREE
     ON
     CACHE BOOL "" FORCE)
 
-set(PROJECT_BUILD_TREE_TARGETS
-    ${SDK_PACKAGE_NAME}::${PACKAGE_NAME}-shared-library
-    ${SDK_PACKAGE_NAME}::${SDK_PACKAGE_NAME}-headers
-    ${SDK_PACKAGE_NAME}::${SDK_PACKAGE_NAME}-stack-protector)
+set(PROJECT_BUILD_TREE_TARGETS ${SDK_PACKAGE_NAME}::${PACKAGE_NAME}-shared-library
+                               ${SDK_PACKAGE_NAME}::${SDK_PACKAGE_NAME}-stack-protector)
 
 configure_file(
     ${PROJECT_SOURCE_DIR}/cmake/Templates/${PACKAGE_NAME}/build-config.cmake.in

cmake/rocprofiler_options.cmake

@@ -53,8 +53,6 @@ rocprofiler_add_option(
 rocprofiler_add_option(ROCPROFILER_BUILD_FMT "Enable building fmt library internally" ON)
 rocprofiler_add_option(ROCPROFILER_BUILD_GLOG
                        "Enable building glog (Google logging) library internally" ON)
-rocprofiler_add_option(ROCPROFILER_BUILD_OPENMP_TESTS
-                       "Enable building openmp tests and samples" OFF ADVANCED)
 if(ROCPROFILER_BUILD_TESTS)
     rocprofiler_add_option(
         ROCPROFILER_BUILD_GTEST

samples/CMakeLists.txt

@@ -32,6 +32,4 @@ add_subdirectory(intercept_table)
 add_subdirectory(code_object_isa_decode)
 add_subdirectory(external_correlation_id_request)
 add_subdirectory(pc_sampling)
-if(ROCPROFILER_BUILD_OPENMP_TESTS)
-    add_subdirectory(openmp_target)
-endif()
+add_subdirectory(openmp_target)

tests/CMakeLists.txt

@@ -68,13 +68,10 @@ add_subdirectory(thread-trace)
 add_subdirectory(pc_sampling)
 add_subdirectory(hip-graph-tracing)
 add_subdirectory(counter-collection)
+add_subdirectory(openmp-tools)
 add_subdirectory(rocdecode)
 add_subdirectory(rocjpeg)
 add_subdirectory(conversion-script)
 
-if(ROCPROFILER_BUILD_OPENMP_TESTS)
-    add_subdirectory(openmp-tools)
-endif()
-
 # rocprofv3 validation tests
 add_subdirectory(rocprofv3)

tests/bin/CMakeLists.txt

@@ -16,9 +16,7 @@ find_package(rocJPEG)
 # applications used by integration tests which DO link to rocprofiler-sdk-roctx
 add_subdirectory(reproducible-runtime)
 add_subdirectory(transpose)
-if(ROCPROFILER_BUILD_OPENMP_TESTS)
-    add_subdirectory(openmp)
-endif()
+add_subdirectory(openmp)
 
 set(CMAKE_BUILD_RPATH "\$ORIGIN:\$ORIGIN/../lib")