summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/slang/slang-emit-cpp.cpp56
-rw-r--r--source/slang/slang-ir-legalize-types.cpp9
-rw-r--r--source/slang/slang-ir-lower-generic-function.cpp3
-rw-r--r--source/slang/slang-ir-lower-generic-type.cpp9
4 files changed, 54 insertions, 23 deletions
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index a178dfe67..d6764ae06 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -1270,13 +1270,26 @@ bool CPPSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOut
IRInst* baseInst = getElementInst->getBase();
IRType* baseType = baseInst->getDataType();
- if (as<IRVectorType>(baseType))
+ if (auto vectorBaseType = as<IRVectorType>(baseType))
{
- m_writer->emit("_slang_vector_get_element(");
- emitOperand(baseInst, getInfo(EmitOp::General));
- m_writer->emit(", ");
- emitOperand(getElementInst->getIndex(), getInfo(EmitOp::General));
- m_writer->emit(")");
+ if (auto intLitIndex = as<IRIntLit>(getElementInst->getIndex()))
+ {
+ // For static index, we can emit simpler code using the `.x`, `.y` members.
+ auto outerPrec = getInfo(EmitOp::General);
+ auto prec = getInfo(EmitOp::Postfix);
+ emitOperand(baseInst, leftSide(outerPrec, prec));
+ m_writer->emit(".");
+ m_writer->emit(getVectorElementNames(vectorBaseType)[intLitIndex->getValue()]);
+ }
+ else
+ {
+ // For dynamic index, we emit using `_slang_vector_get_element` intrinsics.
+ m_writer->emit("_slang_vector_get_element(");
+ emitOperand(baseInst, getInfo(EmitOp::General));
+ m_writer->emit(", ");
+ emitOperand(getElementInst->getIndex(), getInfo(EmitOp::General));
+ m_writer->emit(")");
+ }
return true;
}
else if (as<IRMatrixType>(baseType))
@@ -1297,24 +1310,37 @@ bool CPPSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOut
IRInst* baseInst = getElementInst->getBase();
IRType* baseType = as<IRPtrTypeBase>(baseInst->getDataType())->getValueType();
- if (as<IRVectorType>(baseType))
+ if (auto vectorBaseType = as<IRVectorType>(baseType))
{
- m_writer->emit("_slang_vector_get_element_ptr(");
- emitOperand(baseInst, getInfo(EmitOp::General));
- m_writer->emit(", ");
- emitOperand(getElementInst->getIndex(), getInfo(EmitOp::General));
- m_writer->emit(")");
+ if (auto intLitIndex = as<IRIntLit>(getElementInst->getIndex()))
+ {
+ // For static index, we can emit simpler code using the `.x`, `.y` members.
+ m_writer->emit("&(");
+ auto outerPrec = getInfo(EmitOp::General);
+ auto prec = getInfo(EmitOp::Postfix);
+ emitOperand(baseInst, leftSide(outerPrec, prec));
+ m_writer->emit("->");
+ m_writer->emit(getVectorElementNames(vectorBaseType)[intLitIndex->getValue()]);
+ m_writer->emit(")");
+ }
+ else
+ {
+ m_writer->emit("_slang_vector_get_element_ptr(");
+ emitOperand(baseInst, getInfo(EmitOp::General));
+ m_writer->emit(", ");
+ emitOperand(getElementInst->getIndex(), getInfo(EmitOp::General));
+ m_writer->emit(")");
+ }
return true;
}
else if (as<IRMatrixType>(baseType))
{
- m_writer->emit("&(");
+ m_writer->emit("(");
auto outerPrec = getInfo(EmitOp::General);
auto prec = getInfo(EmitOp::Postfix);
emitOperand(baseInst, leftSide(outerPrec, prec));
- m_writer->emit("->rows[");
+ m_writer->emit("->rows + ");
emitOperand(getElementInst->getIndex(), getInfo(EmitOp::General));
- m_writer->emit("]");
m_writer->emit(")");
return true;
}
diff --git a/source/slang/slang-ir-legalize-types.cpp b/source/slang/slang-ir-legalize-types.cpp
index b9d494c21..52b5bc72f 100644
--- a/source/slang/slang-ir-legalize-types.cpp
+++ b/source/slang/slang-ir-legalize-types.cpp
@@ -2159,6 +2159,8 @@ static LegalVal legalizeInst(
if (newArgs[aa] != inst->getOperand(aa))
recreate = true;
}
+ if (inst->getFullType() != legalType.getSimple())
+ recreate = true;
if (recreate)
{
IRBuilder builder(inst->getModule());
@@ -2169,8 +2171,6 @@ static LegalVal legalizeInst(
context->replacedInstructions.add(inst);
return LegalVal::simple(newInst);
}
- if (inst->getFullType() != legalType.getSimple())
- inst->setFullType(legalType.getSimple());
return LegalVal::simple(inst);
}
@@ -3641,7 +3641,10 @@ struct IRTypeLegalizationPass
//
// * `i` is a user of `inst`, or
// * `i` is a child of `inst`.
- //
+ //
+ if (legalVal.flavor == LegalVal::Flavor::simple)
+ inst = legalVal.irValue;
+
for( auto use = inst->firstUse; use; use = use->nextUse )
{
auto user = use->getUser();
diff --git a/source/slang/slang-ir-lower-generic-function.cpp b/source/slang/slang-ir-lower-generic-function.cpp
index ad43aff95..e45b20563 100644
--- a/source/slang/slang-ir-lower-generic-function.cpp
+++ b/source/slang/slang-ir-lower-generic-function.cpp
@@ -322,7 +322,8 @@ namespace Slang
return;
auto interfaceType = maybeLowerInterfaceType(cast<IRInterfaceType>(witnessTableType->getConformanceType()));
interfaceRequirementVal = sharedContext->findInterfaceRequirementVal(interfaceType, lookupInst->getRequirementKey());
- lookupInst->setFullType((IRType*)interfaceRequirementVal);
+ IRBuilder builder(lookupInst);
+ builder.replaceOperand(&lookupInst->typeUse, interfaceRequirementVal);
}
void lowerSpecialize(IRSpecialize* specializeInst)
diff --git a/source/slang/slang-ir-lower-generic-type.cpp b/source/slang/slang-ir-lower-generic-type.cpp
index 398db4f78..256978346 100644
--- a/source/slang/slang-ir-lower-generic-type.cpp
+++ b/source/slang/slang-ir-lower-generic-type.cpp
@@ -14,7 +14,7 @@ namespace Slang
{
SharedGenericsLoweringContext* sharedContext;
- void processInst(IRInst* inst)
+ IRInst* processInst(IRInst* inst)
{
// Ensure public struct types has RTTI object defined.
if (as<IRStructType>(inst))
@@ -27,7 +27,7 @@ namespace Slang
// Don't modify type insts themselves.
if (as<IRType>(inst))
- return;
+ return inst;
IRBuilder builderStorage(sharedContext->module);
auto builder = &builderStorage;
@@ -35,7 +35,7 @@ namespace Slang
auto newType = sharedContext->lowerType(builder, inst->getFullType());
if (newType != inst->getFullType())
- inst->setFullType((IRType*)newType);
+ inst = builder->replaceOperand(&inst->typeUse, newType);
switch (inst->getOp())
{
@@ -51,6 +51,7 @@ namespace Slang
}
break;
}
+ return inst;
}
void processModule()
@@ -64,7 +65,7 @@ namespace Slang
sharedContext->workList.removeLast();
sharedContext->workListSet.Remove(inst);
- processInst(inst);
+ inst = processInst(inst);
for (auto child = inst->getLastChild(); child; child = child->getPrevInst())
{
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 14:50:02 +0000