encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-12 14:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make adapter info device matching more flexible

Browse Source 
Previously all of the device IDs I was aware of for a given vendor could
be comfortably filtered with a single mask, but there's at least one
exception that has come up since that indicates that support for
multiple different masks per vendor is necessary.

This change allows devices to be identified in groups, with each group
being given a different mask or no mask at all. Architectures may be
shared between groups.

Also added the ability to mark a device group as internal, which will
generate the helper functions (like `IsVendorArchitecture()`) for the
internal architectures but not allow them to be exposed in
GPUAdapterInfo. Internal device IDs may overlap with non-internal ones.

Finally, added some validation logic to prevent duplicate deviceIds or
conflicts between device sets/architectures. This was actually supposed
to be in an earlier CL but somehow got omitted from the version that
eventually landed.

Bug: dawn:1498
Change-Id: Icb8bfbee47324cbd9791f63089877ace86c763db
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/96900
Reviewed-by: Yunchao He <yunchao.he@intel.com>
Commit-Queue: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Brandon Jones
2022-08-02 22:14:35 +00:00
committed by Dawn LUCI CQ
parent ce6246502c
commit 462f648896
4 changed files with 322 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/dawn/gpu_info.json
View File

@@ -17,19 +17,86 @@
"vendors": {
"_Example Vendor": {
"_comment": [
"Each vendor must have an `id` field, which is it's PCI Vendor ID, and may optionally ",
"have a `devices` field which defines device -> architecture mappings which will be ",
"when populating the GPUAdapterInfo. Keys that begin with an `_` (like this one) denote ",
"commnents, and will be ignored by the parser."
],
"id": "0xDEAD",
"devices": [{
"_comment": [
"The `devices` is an array of 'Device Sets', each of which contains an `architecture` ",
"object which defines an architecture name as a key followed by an array of ",
"PCI device IDs that map to that architecture. The architecture name is what will be ",
"reported to the GPUAdapterInfo, made lower-case and with spaces converted to hyphens."
],
"architecture": {
"Alpha": ["0x0A01", "0x0A02"],
"Beta": ["0x0B01", "0x0B02", "0x0B03"]
}
}, {
"_comment": [
"A Device Set can also define a binary `mask`, which will be be applied to any device ",
"ID prior to comparison, making it easier to capture ranges of device IDs. ",
"Architectures may be duplicated between Device Sets as long as the device ID values ",
"Don't overlap."
],
"mask": "0xFF00",
"architecture": {
"Beta": ["0x1B00"],
"Gamma": ["0x0C00", "0x1C00"]
}
}, {
"_comment": [
"Finally, Device Sets may be flagged as `internal`. Architectures defined in an ",
"internal device set will never be reported in the GPUAdapterInfo, but will generate ",
"appropriate helper functions in Dawn (such as `IsExampleVendorDelta()`) in order to ",
"aid in applying workarounds. Device IDs of internal device sets may overlap with ",
"ones defined in non-internal device sets, but architectures must be unique between ",
"internal and non-internal device sets.",
"Internal architectures facilitate the (hopefully rare) cases where more targeted ",
"GPU identification is required by Dawn's implementation than is provided by the normal ",
"architecture groupings. When possible, however, using non-internal architectures ",
"should be preferred when applying workarounds."
],
"internal": true,
"mask": "0xFFF0",
"architecture": {
"Beta Rev 3": ["0x1B30"]
}
}]
},
"AMD": {
"id": "0x1002",
"deviceMask": "0xFFF0",
"architecture": {
"GCN 1": ["0x6600", "0x6610", "0x6660", "0x6790", "0x6800", "0x6810", "0x6820", "0x6830"],
"GCN 2": ["0x1300", "0x1310", "0x6640", "0x6650", "0x67A0", "0x67B0", "0x9830", "0x9850"],
"GCN 3": ["0x6900", "0x6920", "0x6930", "0x7300", "0x9870", "0x98E0"],
"GCN 4": ["0x67C0", "0x67D0", "0x67E0", "0x67F0", "0x6980", "0x6990"],
"GCN 5": ["0x15D0", "0x1630", "0x1640", "0x66A0", "0x6860", "0x6870", "0x6940", "0x69A0"],
"RDNA 1": ["0x7310", "0x7340", "0x7360"],
"RDNA 2": ["0x73A0", "0x73B0", "0x73D0", "0x73E0", "0x73F0", "0x7420", "0x7430"]
}
"devices": [{
"mask": "0xFF00",
"architecture": {
"GCN 2": ["0x1300"],
"GCN 5": ["0x1500", "0x1600"],
"RDNA 2": ["0x7400"]
}
}, {
"mask": "0xFFF0",
"architecture": {
"GCN 1": ["0x6600", "0x6610", "0x6660", "0x6790", "0x6800", "0x6810", "0x6820", "0x6830"],
"GCN 2": ["0x6640", "0x6650", "0x67A0", "0x67B0", "0x9830", "0x9850"],
"GCN 3": ["0x6900", "0x6920", "0x6930", "0x7300", "0x9870", "0x98E0"],
"GCN 4": ["0x67C0", "0x67D0", "0x67E0", "0x67F0", "0x6980", "0x6990"],
"GCN 5": ["0x66A0", "0x6860", "0x6870", "0x6940", "0x69A0"],
"RDNA 1": ["0x7310", "0x7340", "0x7360"],
"RDNA 2": ["0x73A0", "0x73B0", "0x73D0", "0x73E0", "0x73F0"]
}
}]
},
"Apple": {
@@ -47,26 +114,30 @@
"ARM": {
"id": "0x13B5",
"deviceMask": "0xF0000000",
"architecture": {
"_comment": [
"The Midgard GPUs have device IDs like 0x07______ and 0x08______, but it's easiest to",
"mask those values out and simply check for the highest octet being zero, since that",
"distinguishes it from the other architectures."
],
"devices": [{
"mask": "0xF0000000",
"architecture": {
"_comment": [
"The Midgard GPUs have device IDs like 0x07______ and 0x08______, but it's easiest to",
"mask those values out and simply check for the highest octet being zero, since that",
"distinguishes it from the other architectures."
],
"Midgard": ["0x00000000"],
"Bifrost": ["0x60000000", "0x70000000"],
"Valhall": ["0x90000000", "0xA0000000"]
}
"Midgard": ["0x00000000"],
"Bifrost": ["0x60000000", "0x70000000"],
"Valhall": ["0x90000000", "0xA0000000"]
}
}]
},
"Google": {
"id": "0x1AE0",
"architecture": {
"Swiftshader": ["0xC0DE"]
}
"devices": [{
"architecture": {
"Swiftshader": ["0xC0DE"]
}
}]
},
"Img Tec": {
@@ -76,15 +147,17 @@
"Intel": {
"id": "0x8086",
"deviceMask": "0xFF00",
"architecture": {
"Gen 7": ["0x0100", "0x0400", "0x0A00", "0x0D00", "0x0F00"],
"Gen 8": ["0x1600", "0x2200"],
"Gen 9": ["0x1900", "0x3100", "0x3E00", "0x5A00", "0x5900", "0x9B00"],
"Gen 11": ["0x8A00"],
"Gen 12 LP": ["0x4600", "0x4C00", "0x4900", "0x9A00"],
"Gen 12 HP": ["0x4F00", "0x5600"]
}
"devices": [{
"mask": "0xFF00",
"architecture": {
"Gen 7": ["0x0100", "0x0400", "0x0A00", "0x0D00", "0x0F00"],
"Gen 8": ["0x1600", "0x2200"],
"Gen 9": ["0x1900", "0x3100", "0x3E00", "0x5A00", "0x5900", "0x9B00"],
"Gen 11": ["0x8A00"],
"Gen 12 LP": ["0x4600", "0x4C00", "0x4900", "0x9A00"],
"Gen 12 HP": ["0x4F00", "0x5600"]
}
}]
},
"Mesa": {
@@ -94,43 +167,51 @@
"Microsoft": {
"id": "0x1414",
"architecture": {
"WARP": ["0x8c"]
}
"devices": [{
"architecture": {
"WARP": ["0x8c"]
}
}]
},
"Nvidia": {
"id": "0x10DE",
"deviceMask": "0xFF00",
"architecture": {
"Fermi": ["0x0D00"],
"Kepler": ["0x0F00", "0x1000", "0x1100", "0x1200"],
"Maxwell": ["0x1300", "0x1400", "0x1600", "0x1700"],
"Pascal": ["0x1500", "0x1B00", "0x1C00", "0x1D00"],
"Turing": ["0x1E00", "0x1F00", "0x2100"],
"Ampere": ["0x2200", "0x2400", "0x2500"]
}
"devices": [{
"mask": "0xFF00",
"architecture": {
"Fermi": ["0x0D00"],
"Kepler": ["0x0F00", "0x1000", "0x1100", "0x1200"],
"Maxwell": ["0x1300", "0x1400", "0x1600", "0x1700"],
"Pascal": ["0x1500", "0x1B00", "0x1C00", "0x1D00"],
"Turing": ["0x1E00", "0x1F00", "0x2100"],
"Ampere": ["0x2200", "0x2400", "0x2500"]
}
}]
},
"Qualcomm": {
"id": "0x5143",
"deviceMask": "0xFF000000",
"architecture": {
"Adreno 4xx": ["0x04000000"],
"Adreno 5xx": ["0x05000000"],
"Adreno 6xx": ["0x06000000"],
"Adreno 7xx": ["0x07000000"]
}
"devices": [{
"mask": "0xFF000000",
"architecture": {
"Adreno 4xx": ["0x04000000"],
"Adreno 5xx": ["0x05000000"],
"Adreno 6xx": ["0x06000000"],
"Adreno 7xx": ["0x07000000"]
}
}]
},
"Samsung": {
"id": "0x144d",
"architecture": {
"RDNA 2": ["0x73A0"]
}
"devices": [{
"architecture": {
"RDNA 2": ["0x73A0"]
}
}]
}
}