Restructure the folder

Move rocm_smi related function to rocm_smi folder. Move amd_smi to
top level include/ and src/ folder. Remove obsolte oam folder.
Change the CMakeLists.txt to update folder locations.

Change-Id: I52e6be739e49f3b0545865f25364787f5985e9c3

tests/amd_smi_test/CMakeLists.txt

@@ -69,14 +69,14 @@ else()
 endif()
 #
 if (${IS64BIT} EQUAL 0)
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/librocm_smi32.so)
-    message("ERROR: ${AMDSMI_LIB_DIR}/librocm_smi32.so doesn't exist. Check value of ROCM_DIR define")
+  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")
     return()
   endif()
 else()
-  if(NOT EXISTS ${AMDSMI_LIB_DIR}/librocm_smi64.so)
+  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}/librocm_smi64.so")
+    message(" missing: ${AMDSMI_LIB_DIR}/libamd_smi64.so")
     return()
   endif()
 endif()
@@ -200,10 +200,10 @@ LINK_DIRECTORIES(${AMDSMI_LIB_DIR} ${GTEST_LIB_DIR})
 # Extend the list of libraries to be used for linking amdsmi apps
 #
 if (IS64BIT)
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} rocm_smi64)
+  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi64)
   set(AMDSMITST "amdsmitst64")
 else()
-  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} rocm_smi32)
+  set(AMDSMITST_LIBS ${AMDSMITST_LIBS} amd_smi32)
   set(AMDSMITST "amdsmitst")
 endif()
 

tests/amd_smi_test/functional/api_support_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.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"

tests/amd_smi_test/functional/err_cnt_read.cc

@@ -47,7 +47,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/err_cnt_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/evt_notif_read_write.cc

@@ -49,7 +49,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.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"

tests/amd_smi_test/functional/fan_read.cc

@@ -49,7 +49,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/fan_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/fan_read_write.cc

@@ -49,7 +49,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/fan_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/frequencies_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/frequencies_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/frequencies_read_write.cc

@@ -53,7 +53,7 @@
 #include <algorithm>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/frequencies_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/gpu_busy_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/gpu_busy_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/gpu_metrics_read.cc

@@ -51,7 +51,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/gpu_metrics_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/hw_topology_read.cc

@@ -51,7 +51,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/hw_topology_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/id_info_read.cc

@@ -48,7 +48,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/id_info_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/init_shutdown_refcount.cc

@@ -53,7 +53,7 @@
 
 #include "amd_smi_test/functional/init_shutdown_refcount.h"
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/test_common.h"
 
 extern int32_t

tests/amd_smi_test/functional/mem_page_info_read.cc

@@ -48,7 +48,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/mem_page_info_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/mem_util_read.cc

@@ -49,7 +49,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/mem_util_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/metrics_counter_read.cc

@@ -51,7 +51,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/metrics_counter_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/mutual_exclusion.cc

@@ -51,7 +51,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/mutual_exclusion.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/overdrive_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/overdrive_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/overdrive_read_write.cc

@@ -49,7 +49,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/overdrive_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/pci_read_write.cc

@@ -49,7 +49,7 @@
 #include <algorithm>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/pci_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/perf_cntr_read_write.cc

@@ -54,7 +54,7 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/perf_cntr_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/perf_determinism.cc

@@ -53,7 +53,7 @@
 #include <algorithm>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/perf_determinism.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/perf_level_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/perf_level_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/perf_level_read_write.cc

@@ -50,7 +50,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/perf_level_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/power_cap_read_write.cc

@@ -52,7 +52,7 @@
 #include <algorithm>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/power_cap_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/power_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/power_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/power_read_write.cc

@@ -52,7 +52,7 @@
 #include <algorithm>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/power_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/process_info_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/process_info_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/sys_info_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.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"

tests/amd_smi_test/functional/temp_read.cc

@@ -51,7 +51,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/temp_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/version_read.cc

@@ -50,7 +50,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/version_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/volt_freq_curv_read.cc

@@ -50,7 +50,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/volt_freq_curv_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/volt_read.cc

@@ -51,7 +51,7 @@
 #include <map>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/volt_read.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/functional/xgmi_read_write.cc

@@ -49,7 +49,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/functional/xgmi_read_write.h"
 #include "amd_smi_test/test_common.h"
 

tests/amd_smi_test/main.cc

@@ -48,7 +48,7 @@
 #include <memory>
 #include <iostream>
 
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "gtest/gtest.h"
 #include "amd_smi_test/test_common.h"
 #include "amd_smi_test/test_base.h"

tests/amd_smi_test/test_base.cc

@@ -45,7 +45,7 @@
 
 #include <assert.h>
 
-#include "amd_smi.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"

tests/amd_smi_test/test_base.h

@@ -46,7 +46,7 @@
 #define TESTS_AMD_SMI_TEST_TEST_BASE_H_
 
 #include <string>
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 
 // The max devices can be monitored
 #define MAX_MONITOR_DEVICES 128

tests/amd_smi_test/test_common.cc

@@ -53,7 +53,7 @@
 
 #include "amd_smi_test/test_base.h"
 #include "amd_smi_test/test_common.h"
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 
 static const std::map<amdsmi_dev_perf_level_t, const char *>
    kDevPerfLvlNameMap = {

tests/amd_smi_test/test_common.h

@@ -50,7 +50,7 @@
 #include <vector>
 #include <string>
 
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 
 struct AMDSMITstGlobals {
   uint32_t verbosity;

tests/amd_smi_test/test_utils.cc

@@ -45,7 +45,7 @@
 
 #include <map>
 
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 #include "amd_smi_test/test_utils.h"
 
 static const std::map<amdsmi_fw_block_t, const char *> kDevFWNameMap = {

tests/amd_smi_test/test_utils.h

@@ -46,7 +46,7 @@
 #ifndef TESTS_AMD_SMI_TEST_TEST_UTILS_H_
 #define TESTS_AMD_SMI_TEST_TEST_UTILS_H_
 
-#include "amd_smi.h"
+#include "amd_smi/amd_smi.h"
 
 const char *
 NameFromFWEnum(amdsmi_fw_block_t blk);