diff options
| author | Richard Biener <rguenther@suse.de> | 2024-01-26 12:35:57 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2024-01-26 15:36:35 +0100 |
| commit | 209ed06c3acddb25935ecdedf2b31235b71e5c39 (patch) | |
| tree | 1bfca2d78f3f1fe67c54312aa654b06f183eb238 /libgomp | |
| parent | 56d0aba11abe22455f1deffa9eda59f4908453de (diff) | |
| download | gcc-209ed06c3acddb25935ecdedf2b31235b71e5c39.zip gcc-209ed06c3acddb25935ecdedf2b31235b71e5c39.tar.gz gcc-209ed06c3acddb25935ecdedf2b31235b71e5c39.tar.bz2 | |
Fix architecture support in OMP_OFFLOAD_init_device for gcn
The following makes the existing architecture support check work
instead of being optimized away (enum vs. -1). This avoids
later asserts when we assume such devices are never actually
used.
libgomp/
* plugin/plugin-gcn.c
(EF_AMDGPU_MACH::EF_AMDGPU_MACH_UNSUPPORTED): Add.
(isa_code): Return that instead of -1.
(GOMP_OFFLOAD_init_device): Adjust.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/plugin/plugin-gcn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index db28781..588358b 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -384,6 +384,7 @@ struct gcn_image_desc See https://llvm.org/docs/AMDGPUUsage.html#amdgpu-ef-amdgpu-mach-table */ typedef enum { + EF_AMDGPU_MACH_UNSUPPORTED = -1, EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a, EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c, EF_AMDGPU_MACH_AMDGCN_GFX906 = 0x02f, @@ -1727,7 +1728,7 @@ isa_code(const char *isa) { if (!strncmp (isa, gcn_gfx1100_s, gcn_isa_name_len)) return EF_AMDGPU_MACH_AMDGCN_GFX1100; - return -1; + return EF_AMDGPU_MACH_UNSUPPORTED; } /* CDNA2 devices have twice as many VGPRs compared to older devices. */ @@ -3374,7 +3375,7 @@ GOMP_OFFLOAD_init_device (int n) return hsa_error ("Error querying the name of the agent", status); agent->device_isa = isa_code (agent->name); - if (agent->device_isa < 0) + if (agent->device_isa == EF_AMDGPU_MACH_UNSUPPORTED) return hsa_error ("Unknown GCN agent architecture", HSA_STATUS_ERROR); status = hsa_fns.hsa_agent_get_info_fn (agent->id, HSA_AGENT_INFO_VENDOR_NAME, |