From ebe8ddefc48478307d5f206cd3e40c41d28a36e3 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 26 Sep 2023 23:56:06 -0700 Subject: Various SPIRV fixes. (#3231) * Various SPIRV fixes. - Geometry shader support (WIP). - Fix texture get dimension and load. - Fold global GetElement(MakeArray/MakeVector) insts. - Call spvopt to inline all functions. - Translate OpImageSubscript. - Emit struct member names and global variable names. - Fix lowering of OpBitNot -> OpNot, instead of OpBitReverse. * Fix test. * Fix geometry shader. * Fix geometry shader emit. * Add atomic Image access test. * Fix tests. * don't fail if spirv-opt fails. * Update comments. * Fix test. * Cleanups. * indentation --------- Co-authored-by: Yong He Co-authored-by: Ellie Hermaszewska --- source/slang/slang-ir-array-reg-to-mem.cpp | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 source/slang/slang-ir-array-reg-to-mem.cpp (limited to 'source/slang/slang-ir-array-reg-to-mem.cpp') diff --git a/source/slang/slang-ir-array-reg-to-mem.cpp b/source/slang/slang-ir-array-reg-to-mem.cpp new file mode 100644 index 000000000..6f749f242 --- /dev/null +++ b/source/slang/slang-ir-array-reg-to-mem.cpp @@ -0,0 +1,87 @@ +#include "slang-ir-array-reg-to-mem.h" + +#include "slang-ir.h" +#include "slang-ir-insts.h" +#include "slang-ir-util.h" + +namespace Slang +{ + bool eliminateArrayTypeParameters(IRFunc* func) + { + IRBuilder builder(func); + bool changed = false; + List arrayParamIds; + UInt idx = 0; + List paramWorkList; + for (auto param : func->getParams()) + { + if (auto arrayType = as(param->getFullType())) + { + paramWorkList.add(param); + arrayParamIds.add(idx); + } + idx++; + } + for (auto param : paramWorkList) + { + // We have an array type parameter, so we need to replace it with a pointer to the array + // type. + // + // We will also need to insert a `load` instruction at the start of the function body + // to load the actual pointer value from the parameter. + // + if (auto arrayType = as(param->getFullType())) + { + changed = true; + builder.setInsertBefore(param); + auto ptrArrayType = builder.getPtrType(arrayType); + auto newParam = builder.emitParam(ptrArrayType); + setInsertAfterOrdinaryInst(&builder, param); + auto regVal = builder.emitLoad(newParam); + param->replaceUsesWith(regVal); + param->removeAndDeallocate(); + } + } + if (changed) + { + // The function is modified, we need to also update its type. + List paramTypes; + for (auto param : func->getParams()) + { + paramTypes.add(param->getFullType()); + } + auto newFuncType = builder.getFuncType((UInt)paramTypes.getCount(), paramTypes.getBuffer(), func->getResultType()); + func->setFullType(newFuncType); + + // Update all the call sites to pass the arrays by pointer. + traverseUses(func, [&](IRUse* use) + { + if (const auto call = as(use->getUser())) + { + builder.setInsertBefore(call); + for (auto paramId : arrayParamIds) + { + auto arg = call->getArg(paramId); + auto var = builder.emitVar(as(paramTypes[paramId])->getValueType()); + builder.emitStore(var, arg); + call->setArg(paramId, var); + } + } + }); + } + return changed; + } + + bool eliminateArrayTypeSSARegisters(IRModule* module) + { + bool changed = false; + for (auto inst : module->getGlobalInsts()) + { + if (auto func = as(inst)) + { + changed |= eliminateArrayTypeParameters(func); + } + } + return changed; + } +} -- cgit v1.2.3