Skip to content

Commit

Permalink
levelzero: add info attrs about type, nr slices, subslices, EUs and t…
Browse files Browse the repository at this point in the history 
…hreads

And abstract-out a function to query regular and sysman device info.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
@bgoglin
bgoglin committed Nov 30, 2021
1 parent ac8f224 commit 9982828
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 27 deletions.
2 changes: 2 additions & 0 deletions NEWS
View file
Expand Up @@ -31,6 +31,8 @@ Version 2.7.0
Thanks to Jonathan Cameron for the help.
- HWLOC_DONT_MERGE_CLUSTER_GROUPS=1 may be set in the environment
to prevent these groups from being merged with identical caches, etc.
+ Add many new attributes in LevelZero devices to describe their types
and numbers of slices, subslices, execution units and threads.
* Tools
+ Add --grey and --palette options to switch lstopo to greyscale or
white-background-only graphics, or to tune individual colors.
Expand Down
7 changes: 7 additions & 0 deletions doc/hwloc.doxy
View file
Expand Up @@ -1981,6 +1981,13 @@ and SectorSize (in bytes).
<dd>The index of the Level Zero driver within the list of drivers,
and the index of the device within the list of devices managed by this driver.
</dd>
<dt>LevelZeroDeviceType (LevelZero OS devices or subdevices)</dt>
<dd>A string describing the type of device, for instance "GPU", "CPU", "FPGA", etc.
</dd>
<dt>LevelZeroDeviceNumSlices, LevelZeroDeviceNumSubslicesPerSlice, LevelZeroDeviceNumEUsPerSubslice, LevelZeroDeviceNumThreadsPerEU (LevelZero OS devices or subdevices)</dt>
<dd>The number of slices in the devices, of subslices per slice,
of execution units (EU) per subslice, and of threads per EU.
</dd>
<dt>LevelZeroCQGroups, LevelZeroCQGroup2 (LevelZero OS devices)</dt>
<dd>The number of completion queue groups, and the description of the third group
(as <tt>N*0xX</tt> where <tt>N</tt> is the number of queues in the group,
Expand Down
95 changes: 68 additions & 27 deletions hwloc/topology-levelzero.c
View file
Expand Up @@ -14,6 +14,72 @@
#include <level_zero/ze_api.h>
#include <level_zero/zes_api.h>

static void
hwloc__levelzero_properties_get(ze_device_handle_t h, hwloc_obj_t osdev,
int sysman_maybe_missing)
{
ze_result_t res;
ze_device_properties_t prop;
zes_device_properties_t prop2;

memset(&prop, 0, sizeof(prop));
res = zeDeviceGetProperties(h, &prop);
if (res == ZE_RESULT_SUCCESS) {
/* name is the model name followed by the deviceID
* flags 1<<0 means integrated (vs discrete).
*/
char tmp[64];
const char *type;
switch (prop.type) {
case ZE_DEVICE_TYPE_GPU: type = "GPU"; break;
case ZE_DEVICE_TYPE_CPU: type = "CPU"; break;
case ZE_DEVICE_TYPE_FPGA: type = "FPGA"; break;
case ZE_DEVICE_TYPE_MCA: type = "MCA"; break;
case ZE_DEVICE_TYPE_VPU: type = "VPU"; break;
default:
if (!hwloc_hide_errors())
fprintf(stderr, "hwloc/levelzero: unexpected device type %u\n", (unsigned) prop.type);
type = "Unknown";
}
hwloc_obj_add_info(osdev, "LevelZeroDeviceType", type);
snprintf(tmp, sizeof(tmp), "%u", prop.numSlices);
hwloc_obj_add_info(osdev, "LevelZeroDeviceNumSlices", tmp);
snprintf(tmp, sizeof(tmp), "%u", prop.numSubslicesPerSlice);
hwloc_obj_add_info(osdev, "LevelZeroDeviceNumSubslicesPerSlice", tmp);
snprintf(tmp, sizeof(tmp), "%u", prop.numEUsPerSubslice);
hwloc_obj_add_info(osdev, "LevelZeroDeviceNumEUsPerSubslice", tmp);
snprintf(tmp, sizeof(tmp), "%u", prop.numThreadsPerEU);
hwloc_obj_add_info(osdev, "LevelZeroDeviceNumThreadsPerEU", tmp);
}

/* try to get additional info from sysman if enabled */
memset(&prop2, 0, sizeof(prop2));
res = zesDeviceGetProperties(h, &prop2);
if (res == ZE_RESULT_SUCCESS) {
/* old implementations may return "Unknown", recent may return "unknown" */
if (strcasecmp((const char *) prop2.vendorName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroVendor", (const char *) prop2.vendorName);
if (strcasecmp((const char *) prop2.vendorName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroModel", (const char *) prop2.modelName);
if (strcasecmp((const char *) prop2.brandName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroBrand", (const char *) prop2.brandName);
if (strcasecmp((const char *) prop2.serialNumber, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroSerialNumber", (const char *) prop2.serialNumber);
if (strcasecmp((const char *) prop2.boardNumber, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroBoardNumber", (const char *) prop2.boardNumber);
} else {
static int warned = 0;
if (!warned) {
if (sysman_maybe_missing == 1 && !hwloc_hide_errors())
fprintf(stderr, "hwloc/levelzero: zesDeviceGetProperties() failed (ZES_ENABLE_SYSMAN=1 set too late?).\n");
else if (sysman_maybe_missing == 2 && !hwloc_hide_errors())
fprintf(stderr, "hwloc/levelzero: zesDeviceGetProperties() failed (ZES_ENABLE_SYSMAN=0).\n");
warned = 1;
}
/* continue in degraded mode, we'll miss locality and some attributes */
}
}

static int
hwloc_levelzero_discover(struct hwloc_backend *backend, struct hwloc_disc_status *dstatus)
{
Expand Down Expand Up @@ -45,7 +111,7 @@ hwloc_levelzero_discover(struct hwloc_backend *backend, struct hwloc_disc_status
env = getenv("ZES_ENABLE_SYSMAN");
if (!env) {
putenv((char *) "ZES_ENABLE_SYSMAN=1");
/* we'll warn below if we fail to get zes devices */
/* we'll warn in hwloc__levelzero_properties_get() if we fail to get zes devices */
sysman_maybe_missing = 1;
} else if (!atoi(env)) {
sysman_maybe_missing = 2;
Expand Down Expand Up @@ -92,7 +158,6 @@ hwloc_levelzero_discover(struct hwloc_backend *backend, struct hwloc_disc_status
}

for(j=0; j<nbdevices; j++) {
zes_device_properties_t prop;
unsigned nr_cqprops;
zes_pci_properties_t pci;
zes_device_handle_t sdvh = dvh[j];
Expand All @@ -111,31 +176,7 @@ hwloc_levelzero_discover(struct hwloc_backend *backend, struct hwloc_disc_status
snprintf(buffer, sizeof(buffer), "%u", j);
hwloc_obj_add_info(osdev, "LevelZeroDriverDeviceIndex", buffer);

memset(&prop, 0, sizeof(prop));
res = zesDeviceGetProperties(sdvh, &prop);
if (res == ZE_RESULT_SUCCESS) {
/* old implementations may return "Unknown", recent may return "unknown" */
if (strcasecmp((const char *) prop.vendorName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroVendor", (const char *) prop.vendorName);
if (strcasecmp((const char *) prop.vendorName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroModel", (const char *) prop.modelName);
if (strcasecmp((const char *) prop.brandName, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroBrand", (const char *) prop.brandName);
if (strcasecmp((const char *) prop.serialNumber, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroSerialNumber", (const char *) prop.serialNumber);
if (strcasecmp((const char *) prop.boardNumber, "Unknown"))
hwloc_obj_add_info(osdev, "LevelZeroBoardNumber", (const char *) prop.boardNumber);
} else {
static int warned = 0;
if (!warned) {
if (sysman_maybe_missing == 1 && !hwloc_hide_errors())
fprintf(stderr, "hwloc/levelzero: zesDeviceGetProperties() failed (ZES_ENABLE_SYSMAN=1 set too late?).\n");
else if (sysman_maybe_missing == 2 && !hwloc_hide_errors())
fprintf(stderr, "hwloc/levelzero: zesDeviceGetProperties() failed (ZES_ENABLE_SYSMAN=0).\n");
warned = 1;
}
/* continue in degraded mode, we'll miss locality and some attributes */
}
hwloc__levelzero_properties_get(dvh[j], osdev, sysman_maybe_missing);

nr_cqprops = 0;
res = zeDeviceGetCommandQueueGroupProperties(dvh[j], &nr_cqprops, NULL);
Expand Down
18 changes: 18 additions & 0 deletions tests/hwloc/ports/include/levelzero/level_zero/ze_api.h
View file
Expand Up @@ -16,6 +16,24 @@ extern ze_result_t zeInit(int);
extern ze_result_t zeDriverGet(uint32_t *, ze_driver_handle_t *);
extern ze_result_t zeDeviceGet(ze_driver_handle_t, uint32_t *, ze_device_handle_t *);

typedef enum _ze_device_type {
ZE_DEVICE_TYPE_GPU = 1,
ZE_DEVICE_TYPE_CPU = 2,
ZE_DEVICE_TYPE_FPGA = 3,
ZE_DEVICE_TYPE_MCA = 4,
ZE_DEVICE_TYPE_VPU = 5
} ze_device_type_t;

typedef struct ze_device_properties {
ze_device_type_t type;
uint32_t numThreadsPerEU;
uint32_t numEUsPerSubslice;
uint32_t numSubslicesPerSlice;
uint32_t numSlices;
} ze_device_properties_t;

extern ze_result_t zeDeviceGetProperties(ze_device_handle_t, ze_device_properties_t *);

typedef struct ze_command_queue_group_properties {
unsigned long flags;
unsigned numQueues;
Expand Down

0 comments on commit 9982828

Please sign in to comment.