Skip to content

Allow overriding gfx version per-node #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdamNiederer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow overriding gfx version per-node #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8135a1c
Allow overriding gfx version per-node
AdamNiederer Jun 4, 2024
da8055d
Clean up names & eliminate unneeded strcat
AdamNiederer Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/topology.c
View file
Open in desktop
Copy link
Contributor

@kentrussell kentrussell Jun 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is cleaner than the strcat, I think:
snprintf(per_device_override_name, sizeof(per_device_override_name), "HSA_OVERRIDE_GFX_VERSION_%d", node_id);

I'll test this out internally and if it works (and doesn't break any other flows), I'll get it pushed out. Hopefully for 6.2

Copy link
Contributor Author

@AdamNiederer AdamNiederer Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's much better, thank you! Changed in da8055d. And thanks for giving it a spin internally!

Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,7 @@ static HSAKMT_STATUS topology_sysfs_get_node_props(uint32_t node_id,
char *read_buf, *p, *envvar, dummy = '\0';
char prop_name[256];
char path[256];
char per_node_override[32];
unsigned long long prop_val = 0;
uint32_t prog, major = 0, minor = 0, step = 0;
int read_size;
Expand Down Expand Up @@ -1209,8 +1210,8 @@ static HSAKMT_STATUS topology_sysfs_get_node_props(uint32_t node_id,

hsa_gfxip = find_hsa_gfxip_device(props->DeviceId, gfxv_major);
if (hsa_gfxip || gfxv) {
envvar = getenv("HSA_OVERRIDE_GFX_VERSION");
if (envvar) {
snprintf(per_node_override, sizeof(per_node_override), "HSA_OVERRIDE_GFX_VERSION_%d", node_id);
if ((envvar = getenv(per_node_override)) || (envvar = getenv("HSA_OVERRIDE_GFX_VERSION"))) {
/* HSA_OVERRIDE_GFX_VERSION=major.minor.stepping */
if ((sscanf(envvar, "%u.%u.%u%c",
&major, &minor, &step, &dummy) != 3) ||
Expand Down