Merge amd-dev into amd-master 20240228

Signed-off-by: Maisam Arif <maisarif@amd.com>
Change-Id: I501e92241a3067677a3551806b04893ddcc87119


[ROCm/amdsmi commit: 6481b4712a]

projects/amdsmi/py-interface/CMakeLists.txt

@@ -69,6 +69,7 @@ endif()
 # populate version string
 configure_file(pyproject.toml.in ${PY_BUILD_DIR}/pyproject.toml @ONLY)
 configure_file(setup.cfg.in ${PY_BUILD_DIR}/setup.cfg @ONLY)
+configure_file(_version.py.in ${PY_PACKAGE_DIR}/_version.py @ONLY)
 
 add_custom_target(
     python_wrapper
@@ -102,6 +103,7 @@ add_custom_target(
     python_package ALL
     DEPENDS ${PY_BUILD_DIR}/pyproject.toml
             ${PY_BUILD_DIR}/setup.cfg
+            ${PY_PACKAGE_DIR}/_version.py
             ${PY_PACKAGE_DIR}/__init__.py
             ${PY_PACKAGE_DIR}/amdsmi_exception.py
             ${PY_PACKAGE_DIR}/amdsmi_interface.py
@@ -114,6 +116,7 @@ install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/${PY_BUILD_DIR}/pyproject.toml
         ${CMAKE_CURRENT_BINARY_DIR}/${PY_BUILD_DIR}/setup.cfg
+        ${CMAKE_CURRENT_BINARY_DIR}/${PY_PACKAGE_DIR}/_version.py
     DESTINATION ${PY_WRAPPER_INSTALL_DIR}
     COMPONENT dev)
 

projects/amdsmi/py-interface/__init__.py

@@ -19,6 +19,9 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+# Library Version is the tool/amdsmi_interface version
+from ._version import __version__
+
 # Library Initialization
 from .amdsmi_interface import amdsmi_init
 from .amdsmi_interface import amdsmi_shut_down

projects/amdsmi/py-interface/_version.py.in

@@ -0,0 +1 @@
+__version__ = "@amd_smi_libraries_VERSION_STRING@"

projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc

@@ -183,7 +183,14 @@ void TestFrequenciesRead::Run(void) {
           // Verify api support checking functionality is working
           // NOTE:  We expect AMDSMI_STATUS_NOT_SUPPORTED, if rsmi_pcie_bandwidth_t* is NULL
           err = amdsmi_get_gpu_pci_bandwidth(processor_handles_[i], nullptr);
-          ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
+          if (err != amdsmi_status_t::AMDSMI_STATUS_NOT_SUPPORTED) {
+              ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
+          }
+          else {
+              auto status_string("");
+              amdsmi_status_code_to_string(err, &status_string);
+              std::cout << "\t\t** amdsmi_get_gpu_pci_bandwidth(): " << status_string << "\n";
+          }
         }
       }
     }

projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc

@@ -142,7 +142,6 @@ void TestPciReadWrite::Run(void) {
     }
 
     ret = amdsmi_get_gpu_pci_bandwidth(processor_handles_[dv_ind], &bw);
-
     if (ret == AMDSMI_STATUS_NOT_SUPPORTED) {
       std::cout << "TEST FAILURE: Current PCIe bandwidth is not detected. "
         "This is likely because it is not indicated in the pp_dpm_pcie sysfs "
@@ -165,7 +164,14 @@ void TestPciReadWrite::Run(void) {
     // Verify api support checking functionality is working
     // NOTE:  We expect AMDSMI_STATUS_NOT_SUPPORTED, if rsmi_pcie_bandwidth_t* is NULL
     ret = amdsmi_get_gpu_pci_bandwidth(processor_handles_[dv_ind], nullptr);
-    ASSERT_EQ(ret, AMDSMI_STATUS_NOT_SUPPORTED);
+    if (ret != amdsmi_status_t::AMDSMI_STATUS_NOT_SUPPORTED) {
+        ASSERT_EQ(ret, AMDSMI_STATUS_INVAL);
+    }
+    else {
+        auto status_string("");
+        amdsmi_status_code_to_string(ret, &status_string);
+        std::cout << "\t\t** amdsmi_get_gpu_pci_bandwidth(): " << status_string << "\n";
+    }
 
     // First set the bitmask to all supported bandwidths
     freq_bitmask = ~(~0u << bw.transfer_rate.num_supported);