AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge amd-dev into amd-master 20231129

Browse Source 
Signed-off-by: guanyu12 <guanyu12@amd.com>
Change-Id: Id2b757e90e015dc38f62112e00709231154663ab
This commit is contained in:
guanyu12
2023-11-29 10:50:13 +08:00
parent c0c454aaf2 b54086a037
commit 528a488a91
11 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amdsmi_cli/README.md
+1 -1
View File
@@ -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
amdsmi_cli/amdsmi_commands.py
+2 -2
View File
@@ -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"
example/amd_smi_nodrm_example.cc
+1 -2
View File
@@ -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 = {};
include/amd_smi/amdsmi.h
+1 -1
View File
@@ -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;
py-interface/README.md
+2 -2
View File
@@ -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)
```
py-interface/amdsmi_interface.py
+1 -1
View File
@@ -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
}
py-interface/amdsmi_wrapper.py
+1 -1
View File
@@ -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),
]
rocm_smi/include/rocm_smi/rocm_smi.h
+1 -1
View File
@@ -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
rocm_smi/src/rocm_smi.cc
+1 -1
View File
@@ -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 =======";
rocm_smi/src/rocm_smi_device.cc
+1 -1
View File
@@ -395,7 +395,7 @@ static const std::map<const char *, dev_depends_t> 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,
src/amd_smi/amd_smi.cc
+3 -3
View File
@@ -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<uint16_t>::max();
status = rsmi_wrapper(rsmi_dev_xgmi_physical_id_get, processor_handle,
&(info->xgmi_physical_id));
info->oam_id = std::numeric_limits<uint16_t>::max();
status = rsmi_wrapper(rsmi_dev_oam_id_get, processor_handle,
&(info->oam_id));
return AMDSMI_STATUS_SUCCESS;
}