From 1b01ff909afa1eb6700c0dc947e679b9c3890880 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 27 Jun 2023 11:28:14 -0400 Subject: Pointer layout support (#2930) * WIP looking at reflection with pointers. * Added GetPointerLayout. * Initial test via reflection with layout of ptr type. * WIP handles ptrs to types that have layout that hasn't been completed. * Move tests to ptr. * WIP try to take into account lowering correctly between AggTypeDecl and Type, but doesn't quite work. * WIP a different path to handling recursive lowering problem with Ptr. * Fix issues with reflection output. * Small tidy. * Fix for infinite recursion issue. * Lower IRPointerTypeLayout * Working with generics. Has a hack to work around Layout around Ptr in IR. The reflection around the generic - the name isn't much use, it should probably have the generic parameters, but that would require getName to do something more sophisticated. * Fix issue around calling finishOuterGenerics to early. * Remove feature/ptr test. * Fix type legalization being an infinite loop with Ptr self referencing. * Disable the pointer self reference test because produces an infintie loop on emit. * Fixed comment based on review. * Fix for issue with emit and pointers causing infinite recursion. --- tests/reflection/ptr/ptr-generic.slang | 20 ++++ tests/reflection/ptr/ptr-generic.slang.expected | 51 +++++++++ tests/reflection/ptr/ptr-global.slang | 18 +++ tests/reflection/ptr/ptr-global.slang.expected | 82 ++++++++++++++ tests/reflection/ptr/ptr-self-reference.slang | 17 +++ .../ptr/ptr-self-reference.slang.expected | 74 ++++++++++++ tests/reflection/ptr/ptr-struct.slang | 27 +++++ tests/reflection/ptr/ptr-struct.slang.expected | 124 +++++++++++++++++++++ 8 files changed, 413 insertions(+) create mode 100644 tests/reflection/ptr/ptr-generic.slang create mode 100644 tests/reflection/ptr/ptr-generic.slang.expected create mode 100644 tests/reflection/ptr/ptr-global.slang create mode 100644 tests/reflection/ptr/ptr-global.slang.expected create mode 100644 tests/reflection/ptr/ptr-self-reference.slang create mode 100644 tests/reflection/ptr/ptr-self-reference.slang.expected create mode 100644 tests/reflection/ptr/ptr-struct.slang create mode 100644 tests/reflection/ptr/ptr-struct.slang.expected (limited to 'tests/reflection/ptr') diff --git a/tests/reflection/ptr/ptr-generic.slang b/tests/reflection/ptr/ptr-generic.slang new file mode 100644 index 000000000..22f9877e9 --- /dev/null +++ b/tests/reflection/ptr/ptr-generic.slang @@ -0,0 +1,20 @@ +//TEST(64-bit):REFLECTION:-stage compute -no-codegen -target host-callable -entry computeMain + +struct GenericStruct +{ + T someT; + int values[N]; + + Ptr> genericPtr; +}; + +Ptr> genericPtr; + +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + + outputBuffer[dispatchThreadID.x] = genericPtr.someT; +} \ No newline at end of file diff --git a/tests/reflection/ptr/ptr-generic.slang.expected b/tests/reflection/ptr/ptr-generic.slang.expected new file mode 100644 index 000000000..7aebc0187 --- /dev/null +++ b/tests/reflection/ptr/ptr-generic.slang.expected @@ -0,0 +1,51 @@ +result code = 0 +standard error = { +} +standard output = { +{ + "parameters": [ + { + "name": "genericPtr", + "binding": {"kind": "uniform", "offset": 0, "size": 8}, + "type": { + "kind": "pointer", + "valueType": "GenericStruct" + } + }, + { + "name": "outputBuffer", + "binding": {"kind": "uniform", "offset": 8, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "scalar", + "scalarType": "int32" + } + } + } + ], + "entryPoints": [ + { + "name": "computeMain", + "stage:": "compute", + "parameters": [ + { + "name": "dispatchThreadID", + "semanticName": "SV_DISPATCHTHREADID", + "type": { + "kind": "vector", + "elementCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "uint32" + } + } + } + ], + "threadGroupSize": [4, 1, 1] + } + ] +} +} diff --git a/tests/reflection/ptr/ptr-global.slang b/tests/reflection/ptr/ptr-global.slang new file mode 100644 index 000000000..98ddd7e45 --- /dev/null +++ b/tests/reflection/ptr/ptr-global.slang @@ -0,0 +1,18 @@ +//TEST(64-bit):REFLECTION:-stage compute -no-codegen -target host-callable -entry computeMain + +struct SomeStruct +{ + Ptr regularGlobal; + int* regularGlobal2; + int regularGlobal3; +}; + +RWStructuredBuffer inputBuffer; + +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + outputBuffer[dispatchThreadID.x] = int(dispatchThreadID.x); +} \ No newline at end of file diff --git a/tests/reflection/ptr/ptr-global.slang.expected b/tests/reflection/ptr/ptr-global.slang.expected new file mode 100644 index 000000000..bd57d6a4b --- /dev/null +++ b/tests/reflection/ptr/ptr-global.slang.expected @@ -0,0 +1,82 @@ +result code = 0 +standard error = { +} +standard output = { +{ + "parameters": [ + { + "name": "inputBuffer", + "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "struct", + "name": "SomeStruct", + "fields": [ + { + "name": "regularGlobal", + "type": { + "kind": "pointer", + "valueType": "int" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + { + "name": "regularGlobal2", + "type": { + "kind": "pointer", + "valueType": "int" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 8} + }, + { + "name": "regularGlobal3", + "type": { + "kind": "scalar", + "scalarType": "int32" + }, + "binding": {"kind": "uniform", "offset": 16, "size": 4} + } + ] + } + } + }, + { + "name": "outputBuffer", + "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "scalar", + "scalarType": "int32" + } + } + } + ], + "entryPoints": [ + { + "name": "computeMain", + "stage:": "compute", + "parameters": [ + { + "name": "dispatchThreadID", + "semanticName": "SV_DISPATCHTHREADID", + "type": { + "kind": "vector", + "elementCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "uint32" + } + } + } + ], + "threadGroupSize": [4, 1, 1] + } + ] +} +} diff --git a/tests/reflection/ptr/ptr-self-reference.slang b/tests/reflection/ptr/ptr-self-reference.slang new file mode 100644 index 000000000..437b7d61b --- /dev/null +++ b/tests/reflection/ptr/ptr-self-reference.slang @@ -0,0 +1,17 @@ +//TEST(64-bit):REFLECTION:-stage compute -no-codegen -target host-callable -entry computeMain + +struct SomeStruct +{ + int payload; + Ptr next; +}; + +RWStructuredBuffer inputBuffer; + +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + outputBuffer[dispatchThreadID.x] = int(dispatchThreadID.x); +} \ No newline at end of file diff --git a/tests/reflection/ptr/ptr-self-reference.slang.expected b/tests/reflection/ptr/ptr-self-reference.slang.expected new file mode 100644 index 000000000..e17de757a --- /dev/null +++ b/tests/reflection/ptr/ptr-self-reference.slang.expected @@ -0,0 +1,74 @@ +result code = 0 +standard error = { +} +standard output = { +{ + "parameters": [ + { + "name": "inputBuffer", + "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "struct", + "name": "SomeStruct", + "fields": [ + { + "name": "payload", + "type": { + "kind": "scalar", + "scalarType": "int32" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 4} + }, + { + "name": "next", + "type": { + "kind": "pointer", + "valueType": "SomeStruct" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 8} + } + ] + } + } + }, + { + "name": "outputBuffer", + "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "scalar", + "scalarType": "int32" + } + } + } + ], + "entryPoints": [ + { + "name": "computeMain", + "stage:": "compute", + "parameters": [ + { + "name": "dispatchThreadID", + "semanticName": "SV_DISPATCHTHREADID", + "type": { + "kind": "vector", + "elementCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "uint32" + } + } + } + ], + "threadGroupSize": [4, 1, 1] + } + ] +} +} diff --git a/tests/reflection/ptr/ptr-struct.slang b/tests/reflection/ptr/ptr-struct.slang new file mode 100644 index 000000000..ee11ca240 --- /dev/null +++ b/tests/reflection/ptr/ptr-struct.slang @@ -0,0 +1,27 @@ +//TEST(64-bit):REFLECTION:-stage compute -no-codegen -target host-callable -entry computeMain + +struct AnotherStruct +{ + float a; + int b; + Ptr ptrC; +}; + +struct SomeStruct +{ + Ptr ptrInt; + int* ptrInt2; + int anInt; + AnotherStruct another; + Ptr anotherPtr; +}; + +RWStructuredBuffer inputBuffer; + +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + outputBuffer[dispatchThreadID.x] = int(dispatchThreadID.x); +} \ No newline at end of file diff --git a/tests/reflection/ptr/ptr-struct.slang.expected b/tests/reflection/ptr/ptr-struct.slang.expected new file mode 100644 index 000000000..1a7ea5562 --- /dev/null +++ b/tests/reflection/ptr/ptr-struct.slang.expected @@ -0,0 +1,124 @@ +result code = 0 +standard error = { +} +standard output = { +{ + "parameters": [ + { + "name": "inputBuffer", + "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "struct", + "name": "SomeStruct", + "fields": [ + { + "name": "ptrInt", + "type": { + "kind": "pointer", + "valueType": "int" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 8} + }, + { + "name": "ptrInt2", + "type": { + "kind": "pointer", + "valueType": "int" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 8} + }, + { + "name": "anInt", + "type": { + "kind": "scalar", + "scalarType": "int32" + }, + "binding": {"kind": "uniform", "offset": 16, "size": 4} + }, + { + "name": "another", + "type": { + "kind": "struct", + "name": "AnotherStruct", + "fields": [ + { + "name": "a", + "type": { + "kind": "scalar", + "scalarType": "float32" + }, + "binding": {"kind": "uniform", "offset": 0, "size": 4} + }, + { + "name": "b", + "type": { + "kind": "scalar", + "scalarType": "int32" + }, + "binding": {"kind": "uniform", "offset": 4, "size": 4} + }, + { + "name": "ptrC", + "type": { + "kind": "pointer", + "valueType": "int" + }, + "binding": {"kind": "uniform", "offset": 8, "size": 8} + } + ] + }, + "binding": {"kind": "uniform", "offset": 24, "size": 16} + }, + { + "name": "anotherPtr", + "type": { + "kind": "pointer", + "valueType": "AnotherStruct" + }, + "binding": {"kind": "uniform", "offset": 40, "size": 8} + } + ] + } + } + }, + { + "name": "outputBuffer", + "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "type": { + "kind": "resource", + "baseShape": "structuredBuffer", + "access": "readWrite", + "resultType": { + "kind": "scalar", + "scalarType": "int32" + } + } + } + ], + "entryPoints": [ + { + "name": "computeMain", + "stage:": "compute", + "parameters": [ + { + "name": "dispatchThreadID", + "semanticName": "SV_DISPATCHTHREADID", + "type": { + "kind": "vector", + "elementCount": 3, + "elementType": { + "kind": "scalar", + "scalarType": "uint32" + } + } + } + ], + "threadGroupSize": [4, 1, 1] + } + ] +} +} -- cgit v1.2.3