From 37e8917d10626b519470f2e34625f0efe741352f Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 10 Jun 2021 14:57:09 -0400 Subject: CUDA layout corner cases/testing (#1881) * #include an absolute path didn't work - because paths were taken to always be relative. * Add support for sizeOf/alignOf/offsetOf to stdlib. Add $G intrinsic expansion that works of the generic parameters not the param type * Test cuda layout. * Fix CUDA layout issues. Fix reflection to handle other built in types. Fix __offsetOf * Tests of reflection and layout as reported directly from CUDA. * Comment about use of aligned size as size. * Fix warning from VS. * Check alignment is pow2. * Small improvements to alignment calcs. * Tab to spaces. * Fix alignment pointer sizes on 32 bit OS for CUDA. * Fix CUDA reflection on 32 bit. --- tests/cuda/cuda-reflection.slang.expected | 250 ++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+) create mode 100644 tests/cuda/cuda-reflection.slang.expected (limited to 'tests/cuda/cuda-reflection.slang.expected') diff --git a/tests/cuda/cuda-reflection.slang.expected b/tests/cuda/cuda-reflection.slang.expected new file mode 100644 index 000000000..d27d99557 --- /dev/null +++ b/tests/cuda/cuda-reflection.slang.expected @@ -0,0 +1,250 @@ +result code = 0 +standard error = { +} +standard output = { +{ + "parameters": [ + { + "name": "cb", + "binding": {"kind": "uniform", "offset": 0, "size": 8}, + "type": { + "kind": "constantBuffer", + "elementType": { + "kind": "struct", + "name": "StructWithArray", + "fields": [ + { + "name": "a", + "type": { + "kind": "array", + "elementCount": 1, + "elementType": { + "kind": "struct", + "name": "PadLadenStruct", + "fields": [ + { + "name": "a", + "type": { + "kind": "scalar", + "scalarType": "float64" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + { + "name": "b", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 1} + } + ] + }, + "uniformStride": 16 + }, + "binding": {"kind": "uniform", "offset": 0, "size": 16} + }, + { + "name": "c", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 16, "size": 1} + }, + { + "name": "d", + "type": { + "kind": "matrix", + "rowCount": 3, + "columnCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "float16" + } + }, + "binding": {"kind": "uniform", "offset": 20, "size": 24} + }, + { + "name": "e", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 44, "size": 1} + } + ] + }, + "containerVarLayout": { + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + "elementVarLayout": { + "type": { + "kind": "struct", + "name": "StructWithArray", + "fields": [ + { + "name": "a", + "type": { + "kind": "array", + "elementCount": 1, + "elementType": { + "kind": "struct", + "name": "PadLadenStruct", + "fields": [ + { + "name": "a", + "type": { + "kind": "scalar", + "scalarType": "float64" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + { + "name": "b", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 1} + } + ] + }, + "uniformStride": 16 + }, + "binding": {"kind": "uniform", "offset": 0, "size": 16} + }, + { + "name": "c", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 16, "size": 1} + }, + { + "name": "d", + "type": { + "kind": "matrix", + "rowCount": 3, + "columnCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "float16" + } + }, + "binding": {"kind": "uniform", "offset": 20, "size": 24} + }, + { + "name": "e", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 44, "size": 1} + } + ] + }, + "binding": {"kind": "uniform", "offset": 0, "size": 48} + } + } + }, + { + "name": "sb", + "binding": {"kind": "uniform", "offset": 8, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "struct", + "name": "StructWithArray", + "fields": [ + { + "name": "a", + "type": { + "kind": "array", + "elementCount": 1, + "elementType": { + "kind": "struct", + "name": "PadLadenStruct", + "fields": [ + { + "name": "a", + "type": { + "kind": "scalar", + "scalarType": "float64" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + { + "name": "b", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 1} + } + ] + }, + "uniformStride": 16 + }, + "binding": {"kind": "uniform", "offset": 0, "size": 16} + }, + { + "name": "c", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 16, "size": 1} + }, + { + "name": "d", + "type": { + "kind": "matrix", + "rowCount": 3, + "columnCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "float16" + } + }, + "binding": {"kind": "uniform", "offset": 20, "size": 24} + }, + { + "name": "e", + "type": { + "kind": "scalar", + "scalarType": "uint8" + }, + "binding": {"kind": "uniform", "offset": 44, "size": 1} + } + ] + } + } + } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "compute", + "parameters": [ + { + "name": "dispatchThreadID", + "semanticName": "SV_DISPATCHTHREADID", + "type": { + "kind": "vector", + "elementCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "uint32" + } + } + } + ], + "threadGroupSize": [1, 1, 1] + } + ] +} +} -- cgit v1.2.3