From 80a330f0cae4d164eb6b2fe513bde2cf9a3b01c1 Mon Sep 17 00:00:00 2001 From: Julius Ikkala Date: Thu, 16 Jan 2025 06:35:11 +0200 Subject: Implement AnyValue marshalling for 8-bit integers (#6059) * Implement anyvalue marshalling for 8-bit integers * Fix missing offset from int8/uint8 case * Disable anyvalue 8-bit test for DXIL Because it doesn't support 8-bit values anyway. --------- Co-authored-by: Yong He --- source/slang/slang-ir-any-value-marshalling.cpp | 49 +++++++++++++++- tests/compute/pack-any-value-8bit.slang | 68 ++++++++++++++++++++++ .../compute/pack-any-value-8bit.slang.expected.txt | 4 ++ 3 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 tests/compute/pack-any-value-8bit.slang create mode 100644 tests/compute/pack-any-value-8bit.slang.expected.txt diff --git a/source/slang/slang-ir-any-value-marshalling.cpp b/source/slang/slang-ir-any-value-marshalling.cpp index 673a3d168..d1be60035 100644 --- a/source/slang/slang-ir-any-value-marshalling.cpp +++ b/source/slang/slang-ir-any-value-marshalling.cpp @@ -375,6 +375,25 @@ struct AnyValueMarshallingContext } case kIROp_Int8Type: case kIROp_UInt8Type: + if (fieldOffset < static_cast(anyValInfo->fieldKeys.getCount())) + { + auto srcVal = builder->emitLoad(concreteVar); + srcVal = builder->emitCast(builder->getType(kIROp_UIntType), srcVal); + auto dstAddr = builder->emitFieldAddress( + uintPtrType, + anyValueVar, + anyValInfo->fieldKeys[fieldOffset]); + auto dstVal = builder->emitLoad(dstAddr); + dstVal = builder->emitBitfieldInsert( + dstVal->getFullType(), + dstVal, + srcVal, + builder->getIntValue(builder->getUIntType(), 8 * intraFieldOffset), + builder->getIntValue(builder->getUIntType(), 8)); + builder->emitStore(dstAddr, dstVal); + } + advanceOffset(1); + break; case kIROp_UInt64Type: case kIROp_Int64Type: case kIROp_DoubleType: @@ -600,11 +619,35 @@ struct AnyValueMarshallingContext advanceOffset(2); break; } + case kIROp_Int8Type: + case kIROp_UInt8Type: + if (fieldOffset < static_cast(anyValInfo->fieldKeys.getCount())) + { + auto srcAddr = builder->emitFieldAddress( + uintPtrType, + anyValueVar, + anyValInfo->fieldKeys[fieldOffset]); + auto srcVal = builder->emitLoad(srcAddr); + srcVal = builder->emitBitfieldExtract( + srcVal->getFullType(), + srcVal, + builder->getIntValue(builder->getUIntType(), 8 * intraFieldOffset), + builder->getIntValue(builder->getUIntType(), 8)); + if (dataType->getOp() == kIROp_Int8Type) + { + srcVal = builder->emitCast(builder->getType(kIROp_Int8Type), srcVal); + } + else + { + srcVal = builder->emitCast(builder->getType(kIROp_UInt8Type), srcVal); + } + builder->emitStore(concreteVar, srcVal); + } + advanceOffset(1); + break; case kIROp_UInt64Type: case kIROp_Int64Type: case kIROp_DoubleType: - case kIROp_Int8Type: - case kIROp_UInt8Type: case kIROp_PtrType: #if SLANG_PTR_IS_64 case kIROp_IntPtrType: @@ -832,7 +875,7 @@ SlangInt _getAnyValueSizeRaw(IRType* type, SlangInt offset) return alignUp(offset, 2) + 2; case kIROp_UInt8Type: case kIROp_Int8Type: - return -1; + return offset + 1; case kIROp_VectorType: { auto vectorType = static_cast(type); diff --git a/tests/compute/pack-any-value-8bit.slang b/tests/compute/pack-any-value-8bit.slang new file mode 100644 index 000000000..a9050d52c --- /dev/null +++ b/tests/compute/pack-any-value-8bit.slang @@ -0,0 +1,68 @@ +// Test anyvalue packing of 8bit types. + +//TEST_DISABLED(compute):COMPARE_COMPUTE_EX:-slang -compute -cuda -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -render-feature int16 +//TEST_DISABLED(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_2 -use-dxil -output-using-type + +[anyValueSize(20)] +interface IInterface +{ + float run(); +} + +struct Val : IInterface +{ + int8_t v0; + uint8_t v1; + float f0; + uint16_t v2; + uint8_t v3; + uint32_t v4; + uint8_t v5; + float run() + { + return v0 + v1 + f0 + v2 + v3 + v4 + v5; + } +}; + +struct UserDefinedPackedType +{ + uint values[5]; +}; + +//TEST_INPUT:ubuffer(data=[0 0 0], stride=4):out,name=gOutputBuffer +RWStructuredBuffer gOutputBuffer; + +//TEST_INPUT: type_conformance Val:IInterface = 11 + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + UserDefinedPackedType objStorage; + objStorage.values[0] = 0xA5A50201; + objStorage.values[1] = asuint(3.0f); + objStorage.values[2] = 4u|(0xA505u<<16u); + objStorage.values[3] = 6; + objStorage.values[4] = 7; + + IInterface dynamicObj = createDynamicObject(11, objStorage); + float result = dynamicObj.run(); + gOutputBuffer[0] = result; + + Val v; + v.v0 = 1; + v.v1 = 2; + v.f0 = 3; + v.v2 = 4; + v.v3 = 5; + v.v4 = 6; + v.v5 = 7; + + IInterface dynamicObj1 = createDynamicObject(11, v);; + gOutputBuffer[1] = dynamicObj1.run(); + + var packed = reinterpret(v); + var unpacked = reinterpret(packed); + gOutputBuffer[2] = unpacked.run(); +} + diff --git a/tests/compute/pack-any-value-8bit.slang.expected.txt b/tests/compute/pack-any-value-8bit.slang.expected.txt new file mode 100644 index 000000000..a4cb5b798 --- /dev/null +++ b/tests/compute/pack-any-value-8bit.slang.expected.txt @@ -0,0 +1,4 @@ +type: float +28.0 +28.0 +28.0 -- cgit v1.2.3