AI/rocm-systems
2
0
Forka 0
Codice Problemi Pull Request Actions Pacchetti Progetti Rilasci Wiki Attività

Renamed API amdsmi_get_asic_info to

Sfoglia il codice sorgente 
amdsmi_get_gpu_asic_info

grep -rli 'amdsmi_get_asic_info' * | xargs -i@ sed -i
's/amdsmi_get_asic_info/amdsmi_get_gpu_asic_info/g' @

Change-Id: I4586c7f8876eba7b8af33b5ea29afa8bacb85a9a


[ROCm/amdsmi commit: 1f9074916f]
This commit is contained in:
Deepak Mewar
2023-02-25 07:22:16 -05:00
committato da Naveen Krishna Chatradhi
parent 404b8229ac
commit 0bd6f365bc
13 ha cambiato i file con 30 aggiunte e 30 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files
projects/amdsmi/example/amd_smi_drm_example.cc
+2 -2
Vedi File
@@ -282,9 +282,9 @@ int main() {
// Get ASIC info
amdsmi_asic_info_t asic_info = {};
ret = amdsmi_get_asic_info(processor_handles[j], &asic_info);
ret = amdsmi_get_gpu_asic_info(processor_handles[j], &asic_info);
CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_get_asic_info:\n");
printf(" Output of amdsmi_get_gpu_asic_info:\n");
printf("\tMarket Name: %s\n", asic_info.market_name);
printf("\tFamilyID: 0x%x\n", asic_info.family);
printf("\tDeviceID: 0x%lx\n", asic_info.device_id);
projects/amdsmi/example/amd_smi_nodrm_example.cc
+2 -2
Vedi File
@@ -127,9 +127,9 @@ int main() {
bdf.function_number);
amdsmi_asic_info_t asic_info = {};
ret = amdsmi_get_asic_info(processor_handles[j], &asic_info);
ret = amdsmi_get_gpu_asic_info(processor_handles[j], &asic_info);
CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_get_asic_info:\n");
printf(" Output of amdsmi_get_gpu_asic_info:\n");
printf("\tMarket Name: %s\n", asic_info.market_name);
printf("\tFamilyID: 0x%x\n", asic_info.family);
printf("\tDeviceID: 0x%lx\n", asic_info.device_id);
projects/amdsmi/include/amd_smi/amdsmi.h
+1 -1
Vedi File
@@ -3632,7 +3632,7 @@ amdsmi_get_gpu_driver_version(amdsmi_processor_handle processor_handle, int *len
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
*/
amdsmi_status_t
amdsmi_get_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_info_t *info);
amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_info_t *info);
/**
* @brief Returns the board part number and board information for the requested device
projects/amdsmi/py-interface/README.md
+3 -3
Vedi File
@@ -284,7 +284,7 @@ except AmdSmiException as e:
print(e)
```
## amdsmi_get_asic_info
## amdsmi_get_gpu_asic_info
Description: Returns asic information for the given GPU
Input parameters:
@@ -301,7 +301,7 @@ Field | Content
`rev_id` | revision id
`asic_serial` | asic serial
Exceptions that can be thrown by `amdsmi_get_asic_info` function:
Exceptions that can be thrown by `amdsmi_get_gpu_asic_info` function:
* `AmdSmiLibraryException`
* `AmdSmiRetryException`
* `AmdSmiParameterException`
@@ -314,7 +314,7 @@ try:
print("No GPUs on machine")
else:
for device in devices:
asic_info = amdsmi_get_asic_info(device)
asic_info = amdsmi_get_gpu_asic_info(device)
print(asic_info['market_name'])
print(hex(asic_info['family']))
print(hex(asic_info['vendor_id']))
projects/amdsmi/py-interface/__init__.py
+1 -1
Vedi File
@@ -37,7 +37,7 @@ from .amdsmi_interface import amdsmi_get_processor_handle_from_bdf
from .amdsmi_interface import amdsmi_get_gpu_driver_version
# # ASIC and Bus Static Information
from .amdsmi_interface import amdsmi_get_asic_info
from .amdsmi_interface import amdsmi_get_gpu_asic_info
from .amdsmi_interface import amdsmi_get_power_cap_info
from .amdsmi_interface import amdsmi_get_caps_info
projects/amdsmi/py-interface/amdsmi_interface.py
+2 -2
Vedi File
@@ -581,7 +581,7 @@ def amdsmi_get_gpu_device_bdf(processor_handle: amdsmi_wrapper.amdsmi_processor_
return _format_bdf(bdf_info)
def amdsmi_get_asic_info(
def amdsmi_get_gpu_asic_info(
processor_handle: amdsmi_wrapper.amdsmi_processor_handle,
) -> Dict[str, Any]:
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
@@ -591,7 +591,7 @@ def amdsmi_get_asic_info(
asic_info = amdsmi_wrapper.amdsmi_asic_info_t()
_check_res(
amdsmi_wrapper.amdsmi_get_asic_info(
amdsmi_wrapper.amdsmi_get_gpu_asic_info(
processor_handle, ctypes.byref(asic_info))
)
projects/amdsmi/py-interface/amdsmi_wrapper.py
+4 -4
Vedi File
@@ -1673,9 +1673,9 @@ amdsmi_get_gpu_device_uuid.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c
amdsmi_get_gpu_driver_version = _libraries['libamd_smi.so'].amdsmi_get_gpu_driver_version
amdsmi_get_gpu_driver_version.restype = amdsmi_status_t
amdsmi_get_gpu_driver_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_int32), ctypes.POINTER(ctypes.c_char)]
amdsmi_get_asic_info = _libraries['libamd_smi.so'].amdsmi_get_asic_info
amdsmi_get_asic_info.restype = amdsmi_status_t
amdsmi_get_asic_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)]
amdsmi_get_gpu_asic_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_asic_info
amdsmi_get_gpu_asic_info.restype = amdsmi_status_t
amdsmi_get_gpu_asic_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)]
amdsmi_get_board_info = _libraries['libamd_smi.so'].amdsmi_get_board_info
amdsmi_get_board_info.restype = amdsmi_status_t
amdsmi_get_board_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_board_info_t)]
@@ -1893,7 +1893,7 @@ __all__ = \
'amdsmi_frequencies_t', 'amdsmi_frequency_range_t',
'amdsmi_func_id_iter_handle_t', 'amdsmi_func_id_value_t',
'amdsmi_fw_block_t', 'amdsmi_fw_block_t__enumvalues',
'amdsmi_fw_info_t', 'amdsmi_get_asic_info',
'amdsmi_fw_info_t', 'amdsmi_get_gpu_asic_info',
'amdsmi_get_bad_page_info', 'amdsmi_get_board_info',
'amdsmi_get_caps_info', 'amdsmi_get_clock_measure',
'amdsmi_get_compute_process_gpus',
projects/amdsmi/py-interface/rocm_smi_tool.py
+2 -2
Vedi File
@@ -335,7 +335,7 @@ class Formatter:
| """ + self.style.text("46 Get minmax_bandwidth_get. Api: amdsmi_get_minmax_bandwidth <bdf><bdf>") + """ |
| """ + self.style.text("47 Get topo get link type. Api: amdsmi_topo_get_link_type <bdf><bdf>") + """ |
| """ + self.style.text("48 Get is P2P accessible. Api: amdsmi_is_P2P_accessible <bdf><bdf>") + """ |
| """ + self.style.text("49 Get asic info. Api: amdsmi_get_asic_info <bdf>") + """ |
| """ + self.style.text("49 Get asic info. Api: amdsmi_get_gpu_asic_info <bdf>") + """ |
| """ + self.style.text("50 Get processor_handles. Api: amdsmi_get_processor_handles <None>") + """ |
| """ + self.style.text("51 Get event notification. Api: amdsmi_get_event_notification <bdf>") + """ |
| """ + self.style.text("52 Init event notification. Api: amdsmi_init_event_notification <bdf>") + """ |
@@ -871,7 +871,7 @@ commands = {
"device_identifier1": [None, True],
"device_identifier2": [None, True]
}],
49: [smi_api.amdsmi_get_asic_info, {
49: [smi_api.amdsmi_get_gpu_asic_info, {
"device_identifier1": [None, True]
}],
50: [smi_api.amdsmi_get_processor_handles, {}],
projects/amdsmi/src/amd_smi/amd_smi.cc
+7 -7
Vedi File
@@ -559,7 +559,7 @@ amdsmi_status_t amdsmi_get_fw_info(amdsmi_processor_handle processor_handle,
}
amdsmi_status_t
amdsmi_get_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_info_t *info) {
amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_info_t *info) {
AMDSMI_CHECK_INIT();
@@ -890,16 +890,16 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
static const std::map<std::string, const char*> rsmi_2_amdsmi = {
{"rsmi_dev_vram_vendor_get", "amdsmi_get_gpu_vram_vendor"},
{"rsmi_dev_id_get", "amdsmi_get_gpu_id"},
{"rsmi_dev_vendor_id_get", "amdsmi_get_asic_info"},
{"rsmi_dev_vendor_id_get", "amdsmi_get_gpu_asic_info"},
{"rsmi_dev_name_get", "amdsmi_get_board_info"},
{"rsmi_dev_sku_get", "amdsmi_get_board_info"},
{"rsmi_dev_brand_get", "amdsmi_get_asic_info"},
{"rsmi_dev_brand_get", "amdsmi_get_gpu_asic_info"},
{"rsmi_dev_vendor_name_get", "amdsmi_get_gpu_vendor_name"},
{"rsmi_dev_serial_number_get", "amdsmi_get_asic_info"},
{"rsmi_dev_serial_number_get", "amdsmi_get_gpu_asic_info"},
{"rsmi_dev_subsystem_id_get", "amdsmi_get_gpu_subsystem_id"},
{"rsmi_dev_subsystem_name_get", "amdsmi_get_gpu_subsystem_name"},
{"rsmi_dev_drm_render_minor_get", "amdsmi_get_gpu_drm_render_minor"},
{"rsmi_dev_subsystem_vendor_id_get", "amdsmi_get_asic_info"},
{"rsmi_dev_subsystem_vendor_id_get", "amdsmi_get_gpu_asic_info"},
{"rsmi_dev_unique_id_get", "amdsmi_get_board_info"},
{"rsmi_dev_pci_bandwidth_get", "amdsmi_dev_get_pci_bandwidth"},
{"rsmi_dev_pci_id_get", "amdsmi_dev_get_pci_id"},
@@ -1832,7 +1832,7 @@ amdsmi_get_gpu_device_uuid(amdsmi_processor_handle processor_handle, unsigned in
const uint8_t fcn = 0xff;
std::string path = "/sys/class/drm/" + gpu_device->get_gpu_path() + "/device/uuid_info";
status = amdsmi_get_asic_info(processor_handle, &asic_info);
status = amdsmi_get_gpu_asic_info(processor_handle, &asic_info);
if (status != AMDSMI_STATUS_SUCCESS) {
printf("Getting asic info failed. Return code: %d", status);
return status;
@@ -1923,7 +1923,7 @@ amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_processor_handle processor_hand
return AMDSMI_STATUS_API_FAILED;
}
status = amdsmi_get_asic_info(processor_handle, &asic_info);
status = amdsmi_get_gpu_asic_info(processor_handle, &asic_info);
if (status != AMDSMI_STATUS_SUCCESS)
return status;
projects/amdsmi/tests/amd_smi_test/functional/id_info_read.cc
+1 -1
Vedi File
@@ -124,7 +124,7 @@ void TestIdInfoRead::Run(void) {
// vendor_id, unique_id
amdsmi_asic_info_t asci_info;
err = amdsmi_get_asic_info(processor_handles_[0], &asci_info);
err = amdsmi_get_gpu_asic_info(processor_handles_[0], &asci_info);
CHK_ERR_ASRT(err)
// device name, brand, serial_number
projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
+1 -1
Vedi File
@@ -201,7 +201,7 @@ void TestMutualExclusion::Run(void) {
// vendor_id, unique_id
amdsmi_asic_info_t asci_info;
ret = amdsmi_get_asic_info(processor_handles_[0], &asci_info);
ret = amdsmi_get_gpu_asic_info(processor_handles_[0], &asci_info);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
// device name, brand, serial_number
projects/amdsmi/tests/amd_smi_test/functional/sys_info_read.cc
+3 -3
Vedi File
@@ -151,13 +151,13 @@ void TestSysInfoRead::Run(void) {
// vendor_id, unique_id
amdsmi_asic_info_t asci_info;
err = amdsmi_get_asic_info(processor_handles_[0], &asci_info);
err = amdsmi_get_gpu_asic_info(processor_handles_[0], &asci_info);
if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
std::cout <<
"\t**amdsmi_dev_unique_id() is not supported"
" on this machine" << std::endl;
// Verify api support checking functionality is working
err = amdsmi_get_asic_info(processor_handles_[i], nullptr);
err = amdsmi_get_gpu_asic_info(processor_handles_[i], nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
} else {
if (err == AMDSMI_STATUS_SUCCESS) {
@@ -169,7 +169,7 @@ void TestSysInfoRead::Run(void) {
*/
}
// Verify api support checking functionality is working
err = amdsmi_get_asic_info(processor_handles_[i], nullptr);
err = amdsmi_get_gpu_asic_info(processor_handles_[i], nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
} else {
std::cout << "amdsmi_dev_unique_id_get() failed with error " <<
projects/amdsmi/tests/amd_smi_test/test_base.cc
+1 -1
Vedi File
@@ -179,7 +179,7 @@ void TestBase::PrintDeviceHeader(amdsmi_processor_handle dv_ind) {
IF_VERB(STANDARD) {
std::cout << "\t**Device name: " << board_info.product_name << std::endl;
err = amdsmi_get_asic_info(dv_ind, &info);
err = amdsmi_get_gpu_asic_info(dv_ind, &info);
CHK_ERR_ASRT(err)
IF_VERB(STANDARD) {
std::cout << "\t**Device Vendor ID: 0x" << std::hex <<