diff --git a/amdsmi_cli/README.md b/amdsmi_cli/README.md index c7473a0e59..3621ca672c 100644 --- a/amdsmi_cli/README.md +++ b/amdsmi_cli/README.md @@ -409,7 +409,7 @@ ASIC: DEVICE_ID: 0x73bf REV_ID: 0xc3 ASIC_SERIAL: 0xffffffffffffffff - XGMI_PHYSICAL_ID: N/A + OAM_ID: N/A BUS: BDF: 0000:23:00.0 MAX_PCIE_SPEED: 16 GT/s diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py index 35ba4f4ea5..c09b1633b9 100644 --- a/amdsmi_cli/amdsmi_commands.py +++ b/amdsmi_cli/amdsmi_commands.py @@ -245,8 +245,8 @@ class AMDSMICommands(): asic_info['rev_id'] = hex(asic_info['rev_id']) if asic_info['asic_serial'] != '': asic_info['asic_serial'] = hex(int(asic_info['asic_serial'], base=16)) - if asic_info['xgmi_physical_id'] == 0xFFFF: # uint 16 max - asic_info['xgmi_physical_id'] = "N/A" + if asic_info['oam_id'] == 0xFFFF: # uint 16 max + asic_info['oam_id'] = "N/A" static_dict['asic'] = asic_info except amdsmi_exception.AmdSmiLibraryException as e: static_dict['asic'] = "N/A" diff --git a/example/amd_smi_nodrm_example.cc b/example/amd_smi_nodrm_example.cc index 05ff84d669..0f82937569 100644 --- a/example/amd_smi_nodrm_example.cc +++ b/example/amd_smi_nodrm_example.cc @@ -151,8 +151,7 @@ int main() { printf("\tVendorID: 0x%x\n", asic_info.vendor_id); printf("\tRevisionID: 0x%x\n", asic_info.rev_id); printf("\tAsic serial: 0x%s\n", asic_info.asic_serial); - printf("\tXGMI physical id: 0x%x\n\n", - asic_info.xgmi_physical_id); + printf("\tOAM id: 0x%x\n\n", asic_info.oam_id); // Get VBIOS info amdsmi_vbios_info_t vbios_info = {}; diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 66c2a3d6be..96d7b66b39 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -498,7 +498,7 @@ typedef struct { uint64_t device_id; //< The device id of a GPU uint32_t rev_id; char asic_serial[AMDSMI_NORMAL_STRING_LENGTH]; - uint16_t xgmi_physical_id; //< 0xFFFF if not supported + uint16_t oam_id; //< 0xFFFF if not supported uint16_t reserved[37]; } amdsmi_asic_info_t; diff --git a/py-interface/README.md b/py-interface/README.md index dbe0e9fa0b..013c3477b1 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -351,7 +351,7 @@ Field | Content `device_id` | device id `rev_id` | revision id `asic_serial` | asic serial -`xgmi_physical_id` | xgmi physical id +`oam_id` | oam id Exceptions that can be thrown by `amdsmi_get_gpu_asic_info` function: @@ -375,7 +375,7 @@ try: print(hex(asic_info['device_id'])) print(hex(asic_info['rev_id'])) print(asic_info['asic_serial']) - print(asic_info['xgmi_physical_id']) + print(asic_info['oam_id']) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 924c782e5d..c8361d6b3f 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1243,7 +1243,7 @@ def amdsmi_get_gpu_asic_info( "device_id": asic_info.device_id, "rev_id": asic_info.rev_id, "asic_serial": asic_info.asic_serial.decode("utf-8"), - "xgmi_physical_id": asic_info.xgmi_physical_id + "oam_id": asic_info.oam_id } diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 9ab1307a90..6461b3a0d3 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -820,7 +820,7 @@ struct_amdsmi_asic_info_t._fields_ = [ ('device_id', ctypes.c_uint64), ('rev_id', ctypes.c_uint32), ('asic_serial', ctypes.c_char * 32), - ('xgmi_physical_id', ctypes.c_uint16), + ('oam_id', ctypes.c_uint16), ('reserved', ctypes.c_uint16 * 37), ] diff --git a/rocm_smi/include/rocm_smi/rocm_smi.h b/rocm_smi/include/rocm_smi/rocm_smi.h index e397ad27f0..8440175820 100755 --- a/rocm_smi/include/rocm_smi/rocm_smi.h +++ b/rocm_smi/include/rocm_smi/rocm_smi.h @@ -1746,7 +1746,7 @@ rsmi_status_t rsmi_dev_unique_id_get(uint32_t dv_ind, uint64_t *id); * @retval ::RSMI_STATUS_SUCCESS is returned upon successful call. * */ -rsmi_status_t rsmi_dev_xgmi_physical_id_get(uint32_t dv_ind, uint16_t *id); +rsmi_status_t rsmi_dev_oam_id_get(uint32_t dv_ind, uint16_t *id); /** @} */ // end of IDQuer diff --git a/rocm_smi/src/rocm_smi.cc b/rocm_smi/src/rocm_smi.cc index 3a71904b26..988708675d 100755 --- a/rocm_smi/src/rocm_smi.cc +++ b/rocm_smi/src/rocm_smi.cc @@ -941,7 +941,7 @@ rsmi_dev_id_get(uint32_t dv_ind, uint16_t *id) { } rsmi_status_t -rsmi_dev_xgmi_physical_id_get(uint32_t dv_ind, uint16_t *id) { +rsmi_dev_oam_id_get(uint32_t dv_ind, uint16_t *id) { std::ostringstream ss; rsmi_status_t ret; ss << __PRETTY_FUNCTION__ << "| ======= start ======="; diff --git a/rocm_smi/src/rocm_smi_device.cc b/rocm_smi/src/rocm_smi_device.cc index 9aa92b7f3f..469d7cbffb 100755 --- a/rocm_smi/src/rocm_smi_device.cc +++ b/rocm_smi/src/rocm_smi_device.cc @@ -395,7 +395,7 @@ static const std::map kDevFuncDependsMap = { // Functions with only mandatory dependencies {"rsmi_dev_vram_vendor_get", {{kDevVramVendorFName}, {}}}, {"rsmi_dev_id_get", {{kDevDevIDFName}, {}}}, - {"rsmi_dev_xgmi_physical_id_get", {{kDevXGMIPhysicalIDFName}, {}}}, + {"rsmi_dev_oam_id_get", {{kDevXGMIPhysicalIDFName}, {}}}, {"rsmi_dev_revision_get", {{kDevDevRevIDFName}, {}}}, {"rsmi_dev_vendor_id_get", {{kDevVendorIDFName}, {}}}, {"rsmi_dev_name_get", {{kDevVendorIDFName, diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index f92e28c224..ba4c8091b3 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -753,9 +753,9 @@ amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_i info->vendor_name, AMDSMI_MAX_STRING_LENGTH); // default to 0xffff as not supported - info->xgmi_physical_id = std::numeric_limits::max(); - status = rsmi_wrapper(rsmi_dev_xgmi_physical_id_get, processor_handle, - &(info->xgmi_physical_id)); + info->oam_id = std::numeric_limits::max(); + status = rsmi_wrapper(rsmi_dev_oam_id_get, processor_handle, + &(info->oam_id)); return AMDSMI_STATUS_SUCCESS; }