Cleanup tests

Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com> [ROCm/amdsmi commit: 7957b63dd4]
2022-11-03 13:30:16 -05:00
parent 4fede3797c
commit f1125780dd
143 changed files with 298 additions and 464 deletions
@@ -170,6 +170,7 @@ add_subdirectory("rocm_smi")

 if(BUILD_TESTS)
    add_subdirectory("tests/rocm_smi_test")
+    add_subdirectory("tests/amd_smi_test")
 endif()

 # Examples and docs
@@ -1,93 +1,26 @@
-#
-# Minimum version of cmake required
-#
-cmake_minimum_required(VERSION 2.8.0)
-
-#
-#   Required Defines on cmake command line
-#
-#   1) Set location of AMDSMI header files
-#
-#      ROCM_DIR="Root for ROCM install"
-#
-#   2) Set AMDSMITST_BLD_TYPE to either "Debug" or "Release".
-#      If not set, the default value is "Debug" is bound.
-#
-#      AMDSMITST_BLD_TYPE=Debug or AMDSMITST_BLD_TYPE=Release
-#
-#   3) Set AMDSMITST_BLD_BITS to either "32" or "64"
-#      If not set, the default value of "64" is bound.
-#
-#       AMDSMITST_BLD_BITS=32 or AMDSMITST_BLD_BITS=64
-#
-#   Building rocrtst Suite
-#
-#
-#   1) Create build folder e.g. "rocrtst/build" - any name will do
-#   2) Cd into build folder
-#   3) Run "cmake .."
-#   4) Run "make"
-#
-
-#
-# Currently support for Windows platform is not present
-#
-
-#############################
-# COMMON AREA
-#############################
-if(WIN32)
-  message("amdsmi library test suite is not supported on Windows platform")
-  return()
-endif()
-
-#
-# Process input variables
-#
-
 # Required Defines first:
+option(INSTALL_GTEST "Install GTest (only useful if GTest is not already installed)" OFF)

-if(NOT DEFINED AMDSMI_INC_DIR)
-  set(AMDSMI_INC_DIR ${ROCM_DIR}/include)
+# Try to find googletest
+find_package(GTest 1.12.0)
+
+# GTest_FOUND is set to TRUE if ANY version is found
+# GTest_VERSION is set if 1.11.0 or newer version is found
+if(NOT GTest_FOUND STREQUAL "TRUE" OR NOT DEFINED GTest_VERSION)
+    # Google Test wasn't found. Download and compile ourselves
+    include(FetchContent)
+    FetchContent_Declare(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG release-1.12.0)
+    FetchContent_MakeAvailable(googletest)
 endif()

-if(NOT DEFINED AMDSMI_LIB_DIR)
-  set(AMDSMI_LIB_DIR ${ROCM_DIR}/lib)
-endif()
-#
-# Determine AMDSMI Header files are present
-#  (no external source dependencies)
+enable_testing()

-# Determine AMDSMI Library file is present
-#
-if("${AMDSMITST_BLD_BITS}" STREQUAL 32)
-  set (ONLY64STR "")
-  set (IS64BIT 0)
-else()
-  set (ONLY64STR "64")
-  set (IS64BIT 1)
-endif()
-#
-if (${IS64BIT} EQUAL 0)
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/libamd_smi32.so)
-    message("ERROR: ${AMDSMI_LIB_DIR}/libamd_smi32.so doesn't exist. Check value of ROCM_DIR define")
+if(WIN32)
+    message("amd_smi library test suite is not supported on Windows platform")
    return()
-  endif()
-else()
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/libamd_smi64.so)
-    message("ERROR: Define AMDSMI_LIB_DIR pointing to AMDSMI library is not set")
-    message(" missing: ${AMDSMI_LIB_DIR}/libamd_smi64.so")
-    return()
-  endif()
-endif()
-
-string(TOLOWER "${AMDSMITST_BLD_TYPE}" tmp)
-if("${tmp}" STREQUAL release)
-  set(BUILD_TYPE "Release")
-  set(ISDEBUG 0)
-else()
-  set(BUILD_TYPE "Debug")
-  set(ISDEBUG 1)
 endif()

 #
@@ -108,129 +41,30 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
 message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
 message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
-message("--------AMDSMI Lib Dir: " ${AMDSMI_LIB_DIR})
+message("--------RSMI Lib Dir: " ${AMDSMI_LIB_DIR})
 message("")

-#
-# Set the build type based on user input
-#
-set(CMAKE_BUILD_TYPE ${BUILD_TYPE})
-#
-# Flag to enable / disable verbose output.
-#
-set(CMAKE_VERBOSE_MAKEFILE on)
-#
-# Compiler pre-processor definitions.
-#
-# Define MACRO "DEBUG" if build type is "Debug"
-if(${BUILD_TYPE} STREQUAL "Debug")
-add_definitions(-DDEBUG)
-endif()

-add_definitions(-D__linux__)
-add_definitions(-DLITTLEENDIAN_CPU=1)
-
-#
-# Linux Compiler options
-#
-set(CMAKE_CXX_FLAGS "-std=c++11 ")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-
-## Address Sanitize Flag
-if (${ADDRESS_SANITIZER})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -g")
-    set(CMAKE_EXE_LINKER_FLAGS -fsanitize=address)
-
-    if (BUILD_SHARED_LIBS})
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared-libsan" )
-    else ()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libsan" )
-    endif ()
-endif()
-
-
-#
-# Extend the compiler flags for 64-bit builds
-#
-if (IS64BIT)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64  -msse -msse2")
-else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-endif()
-
-#
-# Add compiler flags to include symbol information for debug builds
-#
-if(ISDEBUG)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0")
-endif()
-MESSAGE("ISDEBUG STEP:Done")
-
-
-set(AMDSMITST_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Set Name for Google Test Framework and build it as a
-# static library to be linked with user test programs
-#
-set(GOOGLE_TEST_FRWK_NAME "gtest")
-add_subdirectory(${AMDSMITST_ROOT}/../rocm_smi_test/gtest "${PROJECT_BINARY_DIR}/gtest")
-set (AMDSMITST_LIBS ${AMDSMITST_LIBS} ${GOOGLE_TEST_FRWK_NAME})
-
-#
-#
 # Other source directories
-aux_source_directory(${AMDSMITST_ROOT}/functional functionalSources)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/functional functionalSources)

-#
-# Specify the directory containing various libraries of ROCR
-# to be linked against for building ROC Perf applications
-#
-LINK_DIRECTORIES(${AMDSMI_LIB_DIR} ${GTEST_LIB_DIR})
+link_directories(${AMDSMI_LIB_DIR})

-#
-# Extend the list of libraries to be used for linking amdsmi apps
-#
-if (IS64BIT)
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi64)
-  set(AMDSMITST "amdsmitst64")
-else()
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi32)
-  set(AMDSMITST "amdsmitst")
-endif()
+set(TEST "amdsmitst64")

-
-#
-# Source files for building rocrtst
-#
-aux_source_directory(${AMDSMITST_ROOT} amdsmitstSources)
+# Source files
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} tstSources)

 # Header file include path
-
-include_directories(${AMDSMI_INC_DIR})
-include_directories(${AMDSMITST_ROOT}/..)
-include_directories(${AMDSMITST_ROOT}/../../amd_smi/include)
-include_directories(${AMDSMITST_ROOT}/../../include)
-include_directories(${AMDSMITST_ROOT}/gtest/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)

 # Build rules
-message("--------AMDSMITST: " ${AMDSMITST} )
-message("--------amdsmitstSources: " ${amdsmitstSources} )
-message("--------functionalSources: " ${functionalSources} )
-add_executable(${AMDSMITST} ${amdsmitstSources} ${functionalSources})
+add_executable(${TEST} ${tstSources} ${functionalSources})

-target_link_libraries(${AMDSMITST} ${AMDSMITST_LIBS} c stdc++ pthread)
-
-install(TARGETS ${AMDSMITST}
-        ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
-        LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
-        RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
+target_link_libraries(${TEST} amd_smi64 c stdc++ pthread GTest::gtest_main)

+install(
+    TARGETS ${TEST}
+    ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
+    LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
+    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
@@ -49,11 +49,11 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/api_support_read.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "api_support_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"

 TestAPISupportRead::TestAPISupportRead() : TestBase() {
  set_title("AMDSMI API Support Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestAPISupportRead : public TestBase {
 public:
@@ -46,10 +46,10 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/err_cnt_read.h"
-#include "amd_smi_test/test_common.h"
+#include "err_cnt_read.h"
+#include "../test_common.h"

 TestErrCntRead::TestErrCntRead() : TestBase() {
  set_title("AMDSMI Error Count Read Test");
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestErrCntRead : public TestBase {
 public:
@@ -48,11 +48,11 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/evt_notif_read_write.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "evt_notif_read_write.h"
+#include "../test_common.h"
+#include "../test_utils.h"

 TestEvtNotifReadWrite::TestEvtNotifReadWrite() : TestBase() {
  set_title("AMDSMI Event Notification Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestEvtNotifReadWrite : public TestBase {
 public:
@@ -48,10 +48,10 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/fan_read.h"
-#include "amd_smi_test/test_common.h"
+#include "fan_read.h"
+#include "../test_common.h"

 TestFanRead::TestFanRead() : TestBase() {
  set_title("AMDSMI Fan Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_H_
 #define TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFanRead : public TestBase {
 public:
@@ -48,10 +48,10 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/fan_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "fan_read_write.h"
+#include "../test_common.h"

 TestFanReadWrite::TestFanReadWrite() : TestBase() {
  set_title("AMDSMI Fan Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 #define TESTS_AMDSMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFanReadWrite : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/frequencies_read.h"
-#include "amd_smi_test/test_common.h"
+#include "frequencies_read.h"
+#include "../test_common.h"

 TestFrequenciesRead::TestFrequenciesRead() : TestBase() {
  set_title("AMDSMI Frequencies Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFrequenciesRead : public TestBase {
 public:
@@ -52,10 +52,10 @@
 #include <string>
 #include <algorithm>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/frequencies_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "frequencies_read_write.h"
+#include "../test_common.h"


 TestFrequenciesReadWrite::TestFrequenciesReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFrequenciesReadWrite : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/gpu_busy_read.h"
-#include "amd_smi_test/test_common.h"
+#include "gpu_busy_read.h"
+#include "../test_common.h"

 TestGPUBusyRead::TestGPUBusyRead() : TestBase() {
  set_title("AMDSMI GPU Busy Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestGPUBusyRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/gpu_metrics_read.h"
-#include "amd_smi_test/test_common.h"
+#include "gpu_metrics_read.h"
+#include "../test_common.h"


 TestGpuMetricsRead::TestGpuMetricsRead() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestGpuMetricsRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <vector>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/hw_topology_read.h"
-#include "amd_smi_test/test_common.h"
+#include "hw_topology_read.h"
+#include "../test_common.h"

 typedef struct {
  std::string type;
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestHWTopologyRead : public TestBase {
 public:
@@ -47,10 +47,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/id_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "id_info_read.h"
+#include "../test_common.h"

 TestIdInfoRead::TestIdInfoRead() : TestBase() {
  set_title("AMDSMI ID Info Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestIdInfoRead : public TestBase {
 public:
@@ -51,10 +51,10 @@
 #include <random>
 #include <chrono>  // NOLINT

-#include "amd_smi_test/functional/init_shutdown_refcount.h"
-#include "gtest/gtest.h"
+#include "init_shutdown_refcount.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_common.h"
+#include "../test_common.h"

 extern int32_t
 rsmi_test_refcount(uint64_t refcnt_type);
@@ -46,7 +46,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestConcurrentInit : public TestBase {
 public:
@@ -47,10 +47,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mem_page_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "mem_page_info_read.h"
+#include "../test_common.h"

 TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
  set_title("AMDSMI Memory Page Info Test");
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestMemPageInfoRead : public TestBase {
 public:
@@ -48,10 +48,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mem_util_read.h"
-#include "amd_smi_test/test_common.h"
+#include "mem_util_read.h"
+#include "../test_common.h"

 TestMemUtilRead::TestMemUtilRead() : TestBase() {
  set_title("Memory Utilization Read Test");
@@ -43,7 +43,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MEM_UTIL_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestMemUtilRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/metrics_counter_read.h"
-#include "amd_smi_test/test_common.h"
+#include "metrics_counter_read.h"
+#include "../test_common.h"


 TestMetricsCounterRead::TestMetricsCounterRead() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_METRICS_COUNTER_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestMetricsCounterRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/mutual_exclusion.h"
-#include "amd_smi_test/test_common.h"
+#include "mutual_exclusion.h"
+#include "../test_common.h"

 #define  AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000  //!< Reserved for test

@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_MUTUAL_EXCLUSION_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestMutualExclusion : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/overdrive_read.h"
-#include "amd_smi_test/test_common.h"
+#include "overdrive_read.h"
+#include "../test_common.h"

 TestOverdriveRead::TestOverdriveRead() : TestBase() {
  set_title("AMDSMI Overdrive Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestOverdriveRead : public TestBase {
 public:
@@ -48,10 +48,10 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/overdrive_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "overdrive_read_write.h"
+#include "../test_common.h"

 TestOverdriveReadWrite::TestOverdriveReadWrite() : TestBase() {
  set_title("AMDSMI Overdrive Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_OVERDRIVE_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestOverdriveReadWrite : public TestBase {
 public:
@@ -48,10 +48,10 @@
 #include <string>
 #include <algorithm>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/pci_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "pci_read_write.h"
+#include "../test_common.h"


 TestPciReadWrite::TestPciReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PCI_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPciReadWrite : public TestBase {
 public:
@@ -53,10 +53,10 @@
 #include <vector>
 #include <memory>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_cntr_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_cntr_read_write.h"
+#include "../test_common.h"

 PerfCntrEvtGrp::PerfCntrEvtGrp(amdsmi_event_group_t grp, uint32_t first,
        uint32_t last, std::string name) : grp_(grp), first_evt_(first),
@@ -47,7 +47,7 @@

 #include <string>

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPerfCntrReadWrite : public TestBase {
 public:
@@ -52,10 +52,10 @@
 #include <bitset>
 #include <algorithm>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_determinism.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_determinism.h"
+#include "../test_common.h"


 TestPerfDeterminism::TestPerfDeterminism() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_DETERMINISM_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPerfDeterminism : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_level_read.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_level_read.h"
+#include "../test_common.h"

 TestPerfLevelRead::TestPerfLevelRead() : TestBase() {
  set_title("AMDSMI Performance Level Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPerfLevelRead : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/perf_level_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "perf_level_read_write.h"
+#include "../test_common.h"


 TestPerfLevelReadWrite::TestPerfLevelReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PERF_LEVEL_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPerfLevelReadWrite : public TestBase {
 public:
@@ -51,10 +51,10 @@
 #include <string>
 #include <algorithm>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_cap_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "power_cap_read_write.h"
+#include "../test_common.h"


 TestPowerCapReadWrite::TestPowerCapReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_CAP_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPowerCapReadWrite : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_read.h"
-#include "amd_smi_test/test_common.h"
+#include "power_read.h"
+#include "../test_common.h"

 TestPowerRead::TestPowerRead() : TestBase() {
  set_title("AMDSMI Power Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPowerRead : public TestBase {
 public:
@@ -51,10 +51,10 @@
 #include <string>
 #include <algorithm>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/power_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "power_read_write.h"
+#include "../test_common.h"


 TestPowerReadWrite::TestPowerReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_POWER_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestPowerReadWrite : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/process_info_read.h"
-#include "amd_smi_test/test_common.h"
+#include "process_info_read.h"
+#include "../test_common.h"

 TestProcInfoRead::TestProcInfoRead() : TestBase() {
  set_title("AMDSMI Process Info Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_PROCESS_INFO_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestProcInfoRead : public TestBase {
 public:
@@ -49,11 +49,11 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/sys_info_read.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_utils.h"
+#include "sys_info_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"

 TestSysInfoRead::TestSysInfoRead() : TestBase() {
  set_title("AMDSMI System Info Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_SYS_INFO_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestSysInfoRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/temp_read.h"
-#include "amd_smi_test/test_common.h"
+#include "temp_read.h"
+#include "../test_common.h"


 static const std::map<uint32_t, std::string> kTempSensorNameMap = {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_TEMP_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_TEMP_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestTempRead : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/version_read.h"
-#include "amd_smi_test/test_common.h"
+#include "version_read.h"
+#include "../test_common.h"

 TestVersionRead::TestVersionRead() : TestBase() {
  set_title("AMDSMI Version Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VERSION_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VERSION_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestVersionRead : public TestBase {
 public:
@@ -49,10 +49,10 @@
 #include <iostream>
 #include <string>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/volt_freq_curv_read.h"
-#include "amd_smi_test/test_common.h"
+#include "volt_freq_curv_read.h"
+#include "../test_common.h"

 TestVoltCurvRead::TestVoltCurvRead() : TestBase() {
  set_title("AMDSMI Voltage-Frequency Curve Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_FREQ_CURV_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestVoltCurvRead : public TestBase {
 public:
@@ -50,10 +50,10 @@
 #include <string>
 #include <map>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/volt_read.h"
-#include "amd_smi_test/test_common.h"
+#include "volt_read.h"
+#include "../test_common.h"


 TestVoltRead::TestVoltRead() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_READ_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_VOLT_READ_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestVoltRead : public TestBase {
 public:
@@ -48,10 +48,10 @@

 #include <iostream>

-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/functional/xgmi_read_write.h"
-#include "amd_smi_test/test_common.h"
+#include "xgmi_read_write.h"
+#include "../test_common.h"

 TestXGMIReadWrite::TestXGMIReadWrite() : TestBase() {
  set_title("AMDSMI XGMI Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_AMD_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_
 #define TESTS_AMD_SMI_TEST_FUNCTIONAL_XGMI_READ_WRITE_H_

-#include "amd_smi_test/test_base.h"
+#include "../test_base.h"

 class TestXGMIReadWrite : public TestBase {
 public:
@@ -49,20 +49,20 @@
 #include <iostream>

 #include "amd_smi/amd_smi.h"
-#include "gtest/gtest.h"
-#include "amd_smi_test/test_common.h"
-#include "amd_smi_test/test_base.h"
+#include <gtest/gtest.h>
+#include "test_common.h"
+#include "test_base.h"

 #include "functional/fan_read.h"
 #include "functional/fan_read_write.h"
 #include "functional/evt_notif_read_write.h"
 #include "functional/perf_cntr_read_write.h"
-#include "amd_smi_test/functional/hw_topology_read.h"
+#include "functional/hw_topology_read.h"
 #include "functional/xgmi_read_write.h"
 #include "functional/api_support_read.h"
 #include "functional/process_info_read.h"
 #include "functional/gpu_busy_read.h"
-#include "amd_smi_test/functional/gpu_metrics_read.h"
+#include "functional/gpu_metrics_read.h"
 #include "functional/err_cnt_read.h"
 #include "functional/power_read.h"
 #include "functional/power_read_write.h"
@@ -79,10 +79,10 @@
 #include "functional/perf_level_read.h"
 #include "functional/perf_level_read_write.h"
 #include "functional/pci_read_write.h"
-#include "amd_smi_test/functional/perf_determinism.h"
+#include "functional/perf_determinism.h"
 #include "functional/sys_info_read.h"
 #include "functional/id_info_read.h"
-#include "amd_smi_test/functional/metrics_counter_read.h"
+#include "functional/metrics_counter_read.h"
 #include "functional/version_read.h"
 #include "functional/mutual_exclusion.h"
 #include "functional/init_shutdown_refcount.h"
@@ -46,9 +46,9 @@
 #include <assert.h>

 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_base.h"
-#include "amd_smi_test/test_common.h"
-#include "gtest/gtest.h"
+#include "test_base.h"
+#include "test_common.h"
+#include <gtest/gtest.h>

 static const int kOutputLineLength = 80;
 static const char kLabelDelimiter[] = "####";
@@ -51,8 +51,8 @@
 #include <string>
 #include <map>

-#include "amd_smi_test/test_base.h"
-#include "amd_smi_test/test_common.h"
+#include "test_base.h"
+#include "test_common.h"
 #include "amd_smi/amd_smi.h"

 static const std::map<amdsmi_dev_perf_level_t, const char *>
@@ -46,7 +46,7 @@
 #include <map>

 #include "amd_smi/amd_smi.h"
-#include "amd_smi_test/test_utils.h"
+#include "test_utils.h"

 static const std::map<amdsmi_fw_block_t, const char *> kDevFWNameMap = {
    {FW_ID_ASD, "asd"},
@@ -50,22 +50,21 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/functional functionalSources)

 link_directories(${RSMI_LIB_DIR})

-set(RSMITST "rsmitst64")
+set(TEST "rsmitst64")

 # Source files
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} rsmitstSources)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} tstSources)

 # Header file include path
-include_directories(${RSMI_INC_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)

 # Build rules
-add_executable(${RSMITST} ${rsmitstSources} ${functionalSources})
+add_executable(${TEST} ${tstSources} ${functionalSources})

-target_link_libraries(${RSMITST} amd_smi64 c stdc++ pthread GTest::gtest_main)
+target_link_libraries(${TEST} amd_smi64 c stdc++ pthread GTest::gtest_main)

 install(
-    TARGETS ${RSMITST}
+    TARGETS ${TEST}
    ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib
    LIBRARY DESTINATION ${PROJECT_BINARY_DIR}/lib
    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}/bin)
@@ -51,9 +51,9 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/api_support_read.h"
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_utils.h"
+#include "api_support_read.h"
+#include "../test_common.h"
+#include "../test_utils.h"

 TestAPISupportRead::TestAPISupportRead() : TestBase() {
  set_title("RSMI API Support Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_API_SUPPORT_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestAPISupportRead : public TestBase {
 public:
@@ -48,8 +48,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/err_cnt_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "err_cnt_read.h"
+#include "../test_common.h"

 TestErrCntRead::TestErrCntRead() : TestBase() {
  set_title("RSMI Error Count Read Test");
@@ -43,7 +43,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_ERR_CNT_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestErrCntRead : public TestBase {
 public:
@@ -50,9 +50,9 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/evt_notif_read_write.h"
-#include "rocm_smi_test/test_common.h"
-#include "rocm_smi_test/test_utils.h"
+#include "evt_notif_read_write.h"
+#include "../test_common.h"
+#include "../test_utils.h"

 TestEvtNotifReadWrite::TestEvtNotifReadWrite() : TestBase() {
  set_title("RSMI Event Notification Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_EVT_NOTIF_READ_WRITE_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestEvtNotifReadWrite : public TestBase {
 public:
@@ -50,8 +50,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/fan_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "fan_read.h"
+#include "../test_common.h"

 TestFanRead::TestFanRead() : TestBase() {
  set_title("RSMI Fan Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFanRead : public TestBase {
 public:
@@ -50,8 +50,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/fan_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "fan_read_write.h"
+#include "../test_common.h"

 TestFanReadWrite::TestFanReadWrite() : TestBase() {
  set_title("RSMI Fan Read/Write Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FAN_READ_WRITE_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFanReadWrite : public TestBase {
 public:
@@ -51,8 +51,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/frequencies_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "frequencies_read.h"
+#include "../test_common.h"

 TestFrequenciesRead::TestFrequenciesRead() : TestBase() {
  set_title("RSMI Frequencies Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFrequenciesRead : public TestBase {
 public:
@@ -54,8 +54,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/frequencies_read_write.h"
-#include "rocm_smi_test/test_common.h"
+#include "frequencies_read_write.h"
+#include "../test_common.h"


 TestFrequenciesReadWrite::TestFrequenciesReadWrite() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_FREQUENCIES_READ_WRITE_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestFrequenciesReadWrite : public TestBase {
 public:
@@ -51,8 +51,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/gpu_busy_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "gpu_busy_read.h"
+#include "../test_common.h"

 TestGPUBusyRead::TestGPUBusyRead() : TestBase() {
  set_title("RSMI GPU Busy Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_BUSY_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestGPUBusyRead : public TestBase {
 public:
@@ -52,8 +52,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/gpu_metrics_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "gpu_metrics_read.h"
+#include "../test_common.h"


 TestGpuMetricsRead::TestGpuMetricsRead() : TestBase() {
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_GPU_METRICS_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestGpuMetricsRead : public TestBase {
 public:
@@ -52,8 +52,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/hw_topology_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "hw_topology_read.h"
+#include "../test_common.h"

 typedef struct {
  std::string type;
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_HW_TOPOLOGY_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestHWTopologyRead : public TestBase {
 public:
@@ -49,8 +49,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/id_info_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "id_info_read.h"
+#include "../test_common.h"

 TestIdInfoRead::TestIdInfoRead() : TestBase() {
  set_title("RSMI ID Info Read Test");
@@ -45,7 +45,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_ID_INFO_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestIdInfoRead : public TestBase {
 public:
@@ -51,10 +51,10 @@
 #include <random>
 #include <chrono>  // NOLINT

-#include "rocm_smi_test/functional/init_shutdown_refcount.h"
+#include "init_shutdown_refcount.h"
 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/test_common.h"
+#include "../test_common.h"

 extern int32_t
 rsmi_test_refcount(uint64_t refcnt_type);
@@ -46,7 +46,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_INIT_SHUTDOWN_REFCOUNT_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestConcurrentInit : public TestBase {
 public:
@@ -49,8 +49,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/mem_page_info_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "mem_page_info_read.h"
+#include "../test_common.h"

 TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
  set_title("RSMI Memory Page Info Test");
@@ -43,7 +43,7 @@
 #ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
 #define TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_

-#include "rocm_smi_test/test_base.h"
+#include "../test_base.h"

 class TestMemPageInfoRead : public TestBase {
 public:
@@ -50,8 +50,8 @@

 #include <gtest/gtest.h>
 #include "rocm_smi/rocm_smi.h"
-#include "rocm_smi_test/functional/mem_util_read.h"
-#include "rocm_smi_test/test_common.h"
+#include "mem_util_read.h"
+#include "../test_common.h"

 TestMemUtilRead::TestMemUtilRead() : TestBase() {
  set_title("Memory Utilization Read Test");
--- a/Show More
+++ b/Show More