diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/emit.cpp | 24 | ||||
| -rw-r--r-- | source/slang/hlsl.meta.slang | 8 | ||||
| -rw-r--r-- | source/slang/hlsl.meta.slang.h | 8 | ||||
| -rw-r--r-- | source/slang/lower-to-ir.cpp | 57 |
4 files changed, 73 insertions, 24 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index e93dfbbb5..71d323c9e 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -1095,9 +1095,9 @@ struct EmitVisitor { switch (type->op) { - case kIROp_HLSLByteAddressBufferType: Emit("ByteAddressBuffer"); break; - case kIROp_HLSLRWByteAddressBufferType: Emit("RWByteAddressBuffer"); break; - case kIROp_RaytracingAccelerationStructureType: Emit("RaytracingAccelerationStructureType"); break; + case kIROp_HLSLByteAddressBufferType: Emit("ByteAddressBuffer"); break; + case kIROp_HLSLRWByteAddressBufferType: Emit("RWByteAddressBuffer"); break; + case kIROp_RaytracingAccelerationStructureType: Emit("RaytracingAccelerationStructure"); break; default: SLANG_DIAGNOSE_UNEXPECTED(getSink(), SourceLoc(), "unhandled buffer type"); @@ -1110,9 +1110,9 @@ struct EmitVisitor { switch (type->op) { - case kIROp_HLSLByteAddressBufferType: Emit("ByteAddressBuffer"); break; - case kIROp_HLSLRWByteAddressBufferType: Emit("RWByteAddressBuffer"); break; - case kIROp_RaytracingAccelerationStructureType: Emit("RaytracingAccelerationStructureType"); break; + case kIROp_HLSLByteAddressBufferType: Emit("ByteAddressBuffer"); break; + case kIROp_HLSLRWByteAddressBufferType: Emit("RWByteAddressBuffer"); break; + case kIROp_RaytracingAccelerationStructureType: Emit("RaytracingAccelerationStructure"); break; default: SLANG_DIAGNOSE_UNEXPECTED(getSink(), SourceLoc(), "unhandled buffer type"); @@ -1898,6 +1898,14 @@ struct EmitVisitor String getIRName( IRInst* inst) { + // If the instruction names something + // that should be emitted as a target intrinsic, + // then use that name instead. + if(auto intrinsicDecoration = findTargetIntrinsicDecoration(context, inst)) + { + return intrinsicDecoration->definition; + } + // If the instruction has a mangled name, then emit using that. if (auto globalValue = as<IRGlobalValue>(inst)) { @@ -2498,9 +2506,9 @@ struct EmitVisitor IRTargetIntrinsicDecoration* findTargetIntrinsicDecoration( EmitContext* /* ctx */, - IRFunc* func) + IRInst* inst) { - for (auto dd = func->firstDecoration; dd; dd = dd->next) + for (auto dd = inst->firstDecoration; dd; dd = dd->next) { if (dd->op != kIRDecorationOp_TargetIntrinsic) continue; diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 977cb54b9..bf235eb3c 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -1182,9 +1182,16 @@ __magic_type(RayDescType) __intrinsic_type($(kIROp_RayDescType)) struct RayDesc { + __target_intrinsic(hlsl, Origin) float3 Origin; + + __target_intrinsic(hlsl, TMin) float TMin; + + __target_intrinsic(hlsl, Direction) float3 Direction; + + __target_intrinsic(hlsl, TMax) float TMax; }; @@ -1209,6 +1216,7 @@ __magic_type(BuiltInTriangleIntersectionAttributesType) __intrinsic_type($(kIROp_BuiltInTriangleIntersectionAttributesType)) struct BuiltInTriangleIntersectionAttributes { + __target_intrinsic(hlsl, barycentrics) float2 barycentrics; }; diff --git a/source/slang/hlsl.meta.slang.h b/source/slang/hlsl.meta.slang.h index 7e79eccf6..a1e40c37b 100644 --- a/source/slang/hlsl.meta.slang.h +++ b/source/slang/hlsl.meta.slang.h @@ -1218,9 +1218,16 @@ SLANG_SPLICE(kIROp_RayDescType SLANG_RAW(")\n") SLANG_RAW("struct RayDesc\n") SLANG_RAW("{\n") +SLANG_RAW(" __target_intrinsic(hlsl, Origin)\n") SLANG_RAW(" float3 Origin;\n") +SLANG_RAW("\n") +SLANG_RAW(" __target_intrinsic(hlsl, TMin)\n") SLANG_RAW(" float TMin;\n") +SLANG_RAW("\n") +SLANG_RAW(" __target_intrinsic(hlsl, Direction)\n") SLANG_RAW(" float3 Direction;\n") +SLANG_RAW("\n") +SLANG_RAW(" __target_intrinsic(hlsl, TMax)\n") SLANG_RAW(" float TMax;\n") SLANG_RAW("};\n") SLANG_RAW("\n") @@ -1251,6 +1258,7 @@ SLANG_SPLICE(kIROp_BuiltInTriangleIntersectionAttributesType SLANG_RAW(")\n") SLANG_RAW("struct BuiltInTriangleIntersectionAttributes\n") SLANG_RAW("{\n") +SLANG_RAW(" __target_intrinsic(hlsl, barycentrics)\n") SLANG_RAW(" float2 barycentrics;\n") SLANG_RAW("};\n") SLANG_RAW("\n") diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp index 3953490fe..e5cf19a10 100644 --- a/source/slang/lower-to-ir.cpp +++ b/source/slang/lower-to-ir.cpp @@ -1030,9 +1030,19 @@ struct ValLoweringVisitor : ValVisitor<ValLoweringVisitor, LoweredValInfo, Lower IRType* visitDeclRefType(DeclRefType* type) { + auto declRef = type->declRef; + auto decl = declRef.getDecl(); + + // Check for types with teh `__intrinsic_type` modifier. + if(decl->FindModifier<IntrinsicTypeModifier>()) + { + return lowerSimpleIntrinsicType(type); + } + + return (IRType*) getSimpleVal( context, - emitDeclRef(context, type->declRef, + emitDeclRef(context, declRef, context->irBuilder->getTypeKind())); } @@ -3500,6 +3510,12 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> semanticDecoration->semanticName = semanticModifier->name.getName(); } + // We allow a field to be marked as a target intrinsic, + // so that we can override its mangled name in the + // output for the chosen target. + addTargetIntrinsicDecorations(irFieldKey, fieldDecl); + + return LoweredValInfo::simple(irFieldKey); } @@ -3967,6 +3983,29 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> return v; } + // Attach target-intrinsic decorations to an instruction, + // based on modifiers on an AST declaration. + void addTargetIntrinsicDecorations( + IRInst* irInst, + Decl* decl) + { + for (auto targetMod : decl->GetModifiersOfType<TargetIntrinsicModifier>()) + { + auto decoration = getBuilder()->addDecoration<IRTargetIntrinsicDecoration>(irInst); + decoration->targetName = targetMod->targetToken.Content; + + auto definitionToken = targetMod->definitionToken; + if (definitionToken.type == TokenType::StringLiteral) + { + decoration->definition = getStringLiteralTokenValue(definitionToken); + } + else + { + decoration->definition = definitionToken.Content; + } + } + } + LoweredValInfo lowerFuncDecl(FunctionDeclBase* decl) { // We are going to use a nested builder, because we will @@ -4259,21 +4298,7 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> // If this declaration was marked as having a target-specific lowering // for a particular target, then handle that here. - for (auto targetMod : decl->GetModifiersOfType<TargetIntrinsicModifier>()) - { - auto decoration = getBuilder()->addDecoration<IRTargetIntrinsicDecoration>(irFunc); - decoration->targetName = targetMod->targetToken.Content; - - auto definitionToken = targetMod->definitionToken; - if (definitionToken.type == TokenType::StringLiteral) - { - decoration->definition = getStringLiteralTokenValue(definitionToken); - } - else - { - decoration->definition = definitionToken.Content; - } - } + addTargetIntrinsicDecorations(irFunc, decl); // For convenience, ensure that any additional global // values that were emitted while outputting the function |