esmi library integration update v1.0

1. new class files for cpu socket and cpu core created
2. wrapper API's for getting energy monitoring, system
   statistics, power monitoring values implemented
3. modified amdsmi init & cleanup functions for esmi lib support
4. modified amdsmi system class for esmi lib support
5. sample test code created in example dir

Change-Id: Ic41f31641c283a681de696bb4346b557265bad42

include/amd_smi/impl/amd_smi_common.h

@@ -76,6 +76,35 @@ const std::map<rsmi_status_t, amdsmi_status_t> rsmi_status_map = {
 
 amdsmi_status_t rsmi_to_amdsmi_status(rsmi_status_t status);
 
+#ifdef ENABLE_ESMI_LIB
+// Define a map of esmi status codes to amdsmi status codes
+const std::map<esmi_status_t, amdsmi_status_t> esmi_status_map = {
+    {ESMI_SUCCESS, AMDSMI_STATUS_SUCCESS},
+    {ESMI_INITIALIZED, AMDSMI_STATUS_SUCCESS},
+    {ESMI_INVALID_INPUT, AMDSMI_STATUS_INVAL},
+    {ESMI_NOT_SUPPORTED, AMDSMI_STATUS_NOT_SUPPORTED},
+    {ESMI_PERMISSION, AMDSMI_STATUS_NO_PERM},
+    {ESMI_INTERRUPTED, AMDSMI_STATUS_INTERRUPT},
+    {ESMI_IO_ERROR, AMDSMI_STATUS_IO},
+    {ESMI_FILE_ERROR, AMDSMI_STATUS_FILE_ERROR},
+    {ESMI_NO_MEMORY, AMDSMI_STATUS_OUT_OF_RESOURCES},
+    {ESMI_DEV_BUSY, AMDSMI_STATUS_BUSY},
+    {ESMI_NOT_INITIALIZED, AMDSMI_STATUS_NOT_INIT},
+    {ESMI_UNEXPECTED_SIZE, AMDSMI_STATUS_UNEXPECTED_SIZE},
+    {ESMI_UNKNOWN_ERROR, AMDSMI_STATUS_UNKNOWN_ERROR},
+    {ESMI_NO_ENERGY_DRV, AMDSMI_NO_ENERGY_DRV},
+    {ESMI_NO_MSR_DRV, AMDSMI_NO_MSR_DRV},
+    {ESMI_NO_HSMP_DRV, AMDSMI_NO_HSMP_DRV},
+    {ESMI_NO_HSMP_SUP, AMDSMI_NO_HSMP_SUP},
+    {ESMI_NO_DRV, AMDSMI_NO_DRV},
+    {ESMI_FILE_NOT_FOUND, AMDSMI_FILE_NOT_FOUND},
+    {ESMI_ARG_PTR_NULL, AMDSMI_ARG_PTR_NULL},
+    {ESMI_HSMP_TIMEOUT, AMDSMI_HSMP_TIMEOUT},
+    {ESMI_NO_HSMP_MSG_SUP, AMDSMI_NO_HSMP_MSG_SUP},
+};
+
+amdsmi_status_t esmi_to_amdsmi_status(esmi_status_t status);
+#endif
 }  // namespace smi
 }  // namespace amd
 

include/amd_smi/impl/amd_smi_cpu_core.h

@@ -0,0 +1,77 @@
+/*
+ * =============================================================================
+ * The University of Illinois/NCSA
+ * Open Source License (NCSA)
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Developed by:
+ *
+ *                 AMD Research and AMD ROC Software Development
+ *
+ *                 Advanced Micro Devices, Inc.
+ *
+ *                 www.amd.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal with 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:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimers.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimers in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the names of <Name of Development Group, Name of Institution>,
+ *    nor the names of its contributors may be used to endorse or promote
+ *    products derived from this Software without specific prior written
+ *    permission.
+ *
+ * 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 CONTRIBUTORS 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 WITH THE SOFTWARE.
+ *
+ */
+
+#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_
+#define AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_
+
+#include <string>
+#include <algorithm>
+#include <vector>
+#include "amd_smi/amdsmi.h"
+#include "amd_smi/impl/amd_smi_processor.h"
+
+namespace amd {
+namespace smi {
+
+/*Subclass CPU Core*/
+class AMDSmiCpuCore : public AMDSmiProcessor {
+public:
+    explicit AMDSmiCpuCore(const uint32_t& core_idx):AMDSmiProcessor(AMD_CPU_CORE),core_idx_(core_idx) {}
+
+    virtual ~AMDSmiCpuCore() {}
+
+    void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); }
+    std::vector<AMDSmiProcessor*>& get_processors() { return processors_;}
+    amdsmi_status_t get_processor_count(uint32_t* processor_count) const;
+
+private:
+    uint32_t core_idx_;
+    //uint64_t input;
+    //uint32_t idx;
+    std::vector<AMDSmiProcessor*> processors_;
+};
+
+}  // namespace smi
+}  // namespace amd
+
+#endif  // AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_

include/amd_smi/impl/amd_smi_cpu_socket.h

@@ -0,0 +1,81 @@
+/*
+ * =============================================================================
+ * The University of Illinois/NCSA
+ * Open Source License (NCSA)
+ *
+ * Copyright (c) 2022, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Developed by:
+ *
+ *                 AMD Research and AMD ROC Software Development
+ *
+ *                 Advanced Micro Devices, Inc.
+ *
+ *                 www.amd.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal with 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:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimers.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimers in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the names of <Name of Development Group, Name of Institution>,
+ *    nor the names of its contributors may be used to endorse or promote
+ *    products derived from this Software without specific prior written
+ *    permission.
+ *
+ * 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 CONTRIBUTORS 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 WITH THE SOFTWARE.
+ *
+ */
+
+#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_
+#define AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_
+
+#include <string>
+#include <algorithm>
+#include <vector>
+#include "amd_smi/amdsmi.h"
+#include "amd_smi/impl/amd_smi_processor.h"
+#include "amd_smi/impl/amd_smi_cpu_core.h"
+
+namespace amd {
+namespace smi {
+
+/*Subclass CPU Socket*/
+class AMDSmiCpuSocket : public AMDSmiProcessor {
+ public:
+    explicit AMDSmiCpuSocket(const uint32_t& id):AMDSmiProcessor(AMD_CPU),socket_identifier_(id) {}
+
+    virtual ~AMDSmiCpuSocket() {}
+
+    amdsmi_status_t get_cpu_vendor() { return AMDSMI_STATUS_SUCCESS; }
+    uint32_t get_cpu_id() const { return cpu_id_; }
+    const uint32_t& get_socket_id() const { return socket_identifier_; }
+
+    void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); }
+    std::vector<AMDSmiProcessor*>& get_processors() { return processors_;}
+    amdsmi_status_t get_processor_count(uint32_t* processor_count) const;
+
+ private:
+    uint32_t cpu_id_;
+    uint32_t socket_identifier_;
+    std::vector<AMDSmiProcessor*> processors_;
+};
+
+}  // namespace smi
+}  // namespace amd
+
+#endif  // AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_

include/amd_smi/impl/amd_smi_system.h

@@ -50,6 +50,9 @@
 #include "amd_smi/impl/amd_smi_socket.h"
 #include "amd_smi/impl/amd_smi_processor.h"
 #include "amd_smi/impl/amd_smi_drm.h"
+#ifdef ENABLE_ESMI_LIB
+#include "amd_smi/impl/amd_smi_cpu_socket.h"
+#endif
 
 namespace amd {
 namespace smi {
@@ -75,6 +78,25 @@ class AMDSmiSystem {
     amdsmi_status_t gpu_index_to_handle(uint32_t gpu_index,
                     amdsmi_processor_handle* processor_handle);
 
+#ifdef ENABLE_ESMI_LIB
+    std::vector<AMDSmiCpuSocket*>& get_cpu_sockets() {return cpu_sockets_;}
+
+    amdsmi_status_t handle_to_cpusocket(amdsmi_cpusocket_handle cpusock_handle,
+            AMDSmiCpuSocket** cpu_socket);
+
+    amdsmi_status_t cpu_index_to_handle(uint32_t cpu_index,
+                    amdsmi_cpusocket_handle* cpusock_handle);
+
+    amdsmi_status_t get_cpu_sockets(uint32_t socks);
+
+    amdsmi_status_t get_cpu_cores(uint32_t cpus);
+
+    amdsmi_status_t get_threads_per_core(uint32_t threads);
+
+    amdsmi_status_t get_cpu_family(uint32_t family);
+
+    amdsmi_status_t get_cpu_model(uint32_t model);
+#endif
  private:
     AMDSmiSystem() : init_flag_(AMDSMI_INIT_AMD_GPUS) {}
     amdsmi_status_t get_gpu_bdf_by_index(uint32_t index, std::string& bdf);
@@ -83,6 +105,15 @@ class AMDSmiSystem {
     AMDSmiDrm drm_;
     std::vector<AMDSmiSocket*> sockets_;
     std::set<AMDSmiProcessor*> processors_;     // Track valid processors
+#ifdef ENABLE_ESMI_LIB
+    amdsmi_status_t populate_amd_cpus();
+    std::vector<AMDSmiCpuSocket*> cpu_sockets_;
+    static uint32_t sockets;
+    static uint32_t cpus;
+    static uint32_t threads;
+    static uint32_t family;
+    static uint32_t model;
+#endif
 };