Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make IRWitnessTable HOISTABLE #6417

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Make IRWitnessTable HOISTABLE #6417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
024de9b
WIP: Switch WitnessTable to HOISTABLE
jkwak-work Feb 28, 2025
2265771
Fix a test although it seems to break another
jkwak-work Mar 4, 2025
b4f4ec5
Fix one more failing test.
jkwak-work Mar 4, 2025
d528305
Prevent WitnessTables from being hoisted
jkwak-work Mar 5, 2025
8189082
Update the comments
jkwak-work Mar 6, 2025
2b17660
Clean up in autodiff
jkwak-work Mar 6, 2025
a7474de
Fix compiler warning, which is treated as an error
jkwak-work Mar 6, 2025
12bdad2
Fix the order changing issue
jkwak-work Mar 6, 2025
166a85c
Update comments
jkwak-work Mar 6, 2025
0ce4975
Remove the sorting logic
jkwak-work Mar 7, 2025
f084dc7
Fix some of failing Falcor tests
jkwak-work Mar 7, 2025
9c1a750
Fix two mistakes
jkwak-work Mar 10, 2025
01f27b1
Fix the issues with enum export/import
jkwak-work Mar 14, 2025
7864b8b
Small clean up
jkwak-work Mar 15, 2025
28f9adf
Minor clean up based on the feedback
jkwak-work Mar 18, 2025
11b6d91
Fix the incorrect use of isDeclRefTypeOf
jkwak-work Mar 19, 2025
37deff7
Refactor based on the feedback
jkwak-work Mar 19, 2025
34447fe
Adding a new function addDeduplicatedInst that is simpler than addHoi…
jkwak-work Mar 20, 2025
d19ff64
Simplfy addDeduplicatedInst into addInst
jkwak-work Mar 20, 2025
f768ee7
Fix funciton name conflict of addInst
jkwak-work Mar 21, 2025
f228c09
Merge branch 'master' into feature/make-witness-table-hoistable
jkwak-work Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 152 additions & 100 deletions source/slang/slang-ir-autodiff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,17 +1862,21 @@ IRInst* DifferentiableTypeConformanceContext::buildDifferentiablePairWitness(
sharedContext->differentiableInterfaceType,
(IRType*)pairType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffDiffPairType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffDiffPairType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
}

bool isUserCodeType = as<IRDifferentialPairUserCodeType>(pairType) ? true : false;

Expand Down Expand Up @@ -1944,15 +1948,19 @@ IRInst* DifferentiableTypeConformanceContext::buildDifferentiablePairWitness(
sharedContext->differentiablePtrInterfaceType,
(IRType*)pairType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffDiffPairType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffDiffPairType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
}
}

return table;
Expand Down Expand Up @@ -1987,17 +1995,21 @@ IRInst* DifferentiableTypeConformanceContext::buildArrayWitness(
sharedContext->differentiableInterfaceType,
(IRType*)arrayType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffArrayType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffArrayType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
}

auto elementType = as<IRArrayTypeBase>(diffArrayType)->getElementType();

Expand Down Expand Up @@ -2066,15 +2078,19 @@ IRInst* DifferentiableTypeConformanceContext::buildArrayWitness(
sharedContext->differentiablePtrInterfaceType,
(IRType*)arrayType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffArrayType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffArrayType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
}
}
else
{
Expand Down Expand Up @@ -2105,17 +2121,21 @@ IRInst* DifferentiableTypeConformanceContext::buildTupleWitness(
sharedContext->differentiableInterfaceType,
(IRType*)inTupleType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffTupleType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeStructKey,
diffTupleType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocTypeWitnessStructKey,
table);
builder->createWitnessTableEntry(table, sharedContext->addMethodStructKey, addMethod);
builder->createWitnessTableEntry(table, sharedContext->zeroMethodStructKey, zeroMethod);
}

// Fill in differential method implementations.
{
Expand Down Expand Up @@ -2219,15 +2239,19 @@ IRInst* DifferentiableTypeConformanceContext::buildTupleWitness(
sharedContext->differentiablePtrInterfaceType,
(IRType*)inTupleType);

// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffTupleType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
// Add WitnessTableEntry only once
if (!table->hasDecorationOrChild())
{
// And place it in the synthesized witness table.
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeStructKey,
diffTupleType);
builder->createWitnessTableEntry(
table,
sharedContext->differentialAssocRefTypeWitnessStructKey,
table);
}
}

return table;
Expand Down Expand Up @@ -3078,39 +3102,47 @@ struct AutoDiffPass : public InstPassBase
builder.createWitnessTable(autodiffContext->differentiableInterfaceType, originalType);
result.diffWitness = origTypeIsDiffWitness;

builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->differentialAssocTypeStructKey,
diffType);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->differentialAssocTypeWitnessStructKey,
diffTypeIsDiffWitness);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->zeroMethodStructKey,
zeroMethod);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->addMethodStructKey,
addMethod);

builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->differentialAssocTypeStructKey,
diffType);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->differentialAssocTypeWitnessStructKey,
diffTypeIsDiffWitness);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->zeroMethodStructKey,
zeroMethod);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->addMethodStructKey,
addMethod);
// Add WitnessTableEntry only once
if (!origTypeIsDiffWitness->hasDecorationOrChild())
{
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->differentialAssocTypeStructKey,
diffType);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->differentialAssocTypeWitnessStructKey,
diffTypeIsDiffWitness);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->zeroMethodStructKey,
zeroMethod);
builder.createWitnessTableEntry(
origTypeIsDiffWitness,
autodiffContext->addMethodStructKey,
addMethod);
}

// Add WitnessTableEntry only once
if (!diffTypeIsDiffWitness->hasDecorationOrChild())
{
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->differentialAssocTypeStructKey,
diffType);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->differentialAssocTypeWitnessStructKey,
diffTypeIsDiffWitness);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->zeroMethodStructKey,
zeroMethod);
builder.createWitnessTableEntry(
diffTypeIsDiffWitness,
autodiffContext->addMethodStructKey,
addMethod);
}
return result;
}

Expand Down Expand Up @@ -3177,14 +3209,34 @@ struct AutoDiffPass : public InstPassBase
List<IRInst*> args;
for (auto param : genType->getParams())
args.add(param);
as<IRWitnessTable>(innerResult.diffWitness)
->setConcreteType((IRType*)builder.emitSpecializeInst(
builder.getTypeKind(),
originalType,
(UInt)args.getCount(),
args.getBuffer()));

// Create a new WitnessTable with a different concreteType.
auto concreteType = as<IRType>(builder.emitSpecializeInst(
builder.getTypeKind(),
originalType,
(UInt)args.getCount(),
args.getBuffer()));

auto witnessTableType =
cast<IRWitnessTableType>(innerResult.diffWitness->getFullType());
auto conformanceType = cast<IRType>(witnessTableType->getConformanceType());
auto newWitnessTable = builder.createWitnessTable(conformanceType, concreteType);

// Add WitnessTableEntry only once
if (!newWitnessTable->hasDecorationOrChild())
{
builder.setInsertInto(newWitnessTable);
for (auto entry : as<IRWitnessTable>(innerResult.diffWitness)->getEntries())
{
builder.createWitnessTableEntry(
newWitnessTable,
entry->getRequirementKey(),
entry->getSatisfyingVal());
}
}

result.diffWitness =
hoistValueFromGeneric(builder, innerResult.diffWitness, specInst, true);
hoistValueFromGeneric(builder, newWitnessTable, specInst, true);
}
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion source/slang/slang-ir-inst-defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ INST(GlobalConstant, globalConstant, 0, GLOBAL)

INST(StructKey, key, 0, GLOBAL)
INST(GlobalGenericParam, global_generic_param, 0, GLOBAL)
INST(WitnessTable, witness_table, 0, 0)
INST(WitnessTable, witness_table, 0, HOISTABLE)

INST(IndexedFieldKey, indexedFieldKey, 2, HOISTABLE)

Expand Down
2 changes: 0 additions & 2 deletions source/slang/slang-ir-insts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2980,8 +2980,6 @@ struct IRWitnessTable : IRInst

IRType* getConcreteType() { return (IRType*)getOperand(0); }

void setConcreteType(IRType* t) { return setOperand(0, t); }

IR_LEAF_ISA(WitnessTable)
};

Expand Down
2 changes: 2 additions & 0 deletions source/slang/slang-ir-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,8 @@ IRWitnessTable* cloneWitnessTableImpl(
clonedBaseType = cloneType(context, (IRType*)(originalTable->getConformanceType()));
auto clonedSubType = cloneType(context, (IRType*)(originalTable->getConcreteType()));
clonedTable = builder->createWitnessTable(clonedBaseType, clonedSubType);
if (clonedTable->hasDecorationOrChild())
return clonedTable;
}
else
{
Expand Down
Loading
Loading