diff options
| author | Yong He <yonghe@outlook.com> | 2020-06-15 09:04:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 09:04:53 -0700 |
| commit | 90444f8366255f274993ce4699738d9ab7cf4ee1 (patch) | |
| tree | 6fa9364535f210698b0ee13894ab956b8dd12c7b /source/slang/slang-ir.cpp | |
| parent | 36a06f1289c9a68a261920ef5d34f075f2a43219 (diff) | |
Generate IRType for interfaces, and reference them as `operand[0]` in IRWitnessTable values (#1387)
* Generate IRType for interfaces, and use them as the type of IRWitnessTable values.
This results the following IR for the included test case:
```
[export("_S3tu010IInterface7Computep1pii")]
let %1 : _ = key
[export("_ST3tu010IInterface")]
[nameHint("IInterface")]
interface %IInterface : _(%1);
[export("_S3tu04Impl7Computep1pii")]
[nameHint("Impl.Compute")]
func %Implx5FCompute : Func(Int, Int)
{
block %2(
[nameHint("inVal")]
param %inVal : Int):
let %3 : Int = mul(%inVal, %inVal)
return_val(%3)
}
[export("_SW3tu04Impl3tu010IInterface")]
witness_table %4 : %IInterface
{
witness_table_entry(%1,%Implx5FCompute)
}
```
* Fixes per code review comments.
Moved interface type reference in IRWitnessTable from their type to operand[0].
* Fix typo in comment.
Diffstat (limited to 'source/slang/slang-ir.cpp')
| -rw-r--r-- | source/slang/slang-ir.cpp | 82 |
1 files changed, 46 insertions, 36 deletions
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp index 136bf322f..4d507de41 100644 --- a/source/slang/slang-ir.cpp +++ b/source/slang/slang-ir.cpp @@ -2770,12 +2770,13 @@ namespace Slang return inst; } - IRWitnessTable* IRBuilder::createWitnessTable() + IRWitnessTable* IRBuilder::createWitnessTable(IRType* baseType) { IRWitnessTable* witnessTable = createInst<IRWitnessTable>( this, kIROp_WitnessTable, - nullptr); + nullptr, + baseType); addGlobalValue(this, witnessTable); return witnessTable; } @@ -2810,12 +2811,14 @@ namespace Slang return structType; } - IRInterfaceType* IRBuilder::createInterfaceType() + IRInterfaceType* IRBuilder::createInterfaceType(UInt operandCount, IRInst* const* operands) { IRInterfaceType* interfaceType = createInst<IRInterfaceType>( this, kIROp_InterfaceType, - nullptr); + nullptr, + operandCount, + operands); addGlobalValue(this, interfaceType); return interfaceType; } @@ -4209,6 +4212,42 @@ namespace Slang dump(context, "}"); } + static void dumpInstOperandList( + IRDumpContext* context, + IRInst* inst) + { + UInt argCount = inst->getOperandCount(); + + if (argCount == 0) + return; + + UInt ii = 0; + + // Special case: make printing of `call` a bit + // nicer to look at + if (inst->op == kIROp_Call && argCount > 0) + { + dump(context, " "); + auto argVal = inst->getOperand(ii++); + dumpOperand(context, argVal); + } + + bool first = true; + dump(context, "("); + for (; ii < argCount; ++ii) + { + if (!first) + dump(context, ", "); + + auto argVal = inst->getOperand(ii); + + dumpOperand(context, argVal); + + first = false; + } + + dump(context, ")"); + } void dumpIRWitnessTableEntry( IRDumpContext* context, @@ -4234,6 +4273,8 @@ namespace Slang dumpInstTypeClause(context, inst->getFullType()); + dumpInstOperandList(context, inst); + if (!inst->getFirstChild()) { // Empty. @@ -4321,38 +4362,7 @@ namespace Slang dump(context, opInfo.name); - UInt argCount = inst->getOperandCount(); - - if(argCount == 0) - return; - - UInt ii = 0; - - // Special case: make printing of `call` a bit - // nicer to look at - if (inst->op == kIROp_Call && argCount > 0) - { - dump(context, " "); - auto argVal = inst->getOperand(ii++); - dumpOperand(context, argVal); - } - - bool first = true; - dump(context, "("); - for (; ii < argCount; ++ii) - { - if (!first) - dump(context, ", "); - - auto argVal = inst->getOperand(ii); - - dumpOperand(context, argVal); - - first = false; - } - - dump(context, ")"); - + dumpInstOperandList(context, inst); } static void dumpInstBody( |
