summaryrefslogtreecommitdiff
path: root/source/slang/slang-ir.cpp
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-08-15 20:28:42 +0800
committerGitHub <noreply@github.com>2023-08-15 20:28:42 +0800
commit00bd481e001e8c0b8008eaff5a38fa37963e6f99 (patch)
treed068f0649167bff80b9cd3aa7d32d790540e9564 /source/slang/slang-ir.cpp
parent113a257aafe4403c3ab905098d0560635ca94286 (diff)
SPIR-V WIP (#3064)
* Add type layout for structured buffer * Default to generating spirv directly * vk test for compute simple * Add spirv-dis as a downstream compiler * Emit Array types in SPIR-V * makevector for spirv * Dump whole spirv module on validation failure * register array types todo, use emitTypeInst * Neater formatting for unhandled inst printing * break out emitCompositeConstruct * Correct array type generation * neaten * Allow getElement for vector * Remove unused * Allow predicating target intrinsics on types * Consider functions with intrinsics to have definitions We need to specialize these if they are predicated on types * Correct array type generation * makeArray for spir-v * replace getElement with getElementPtr for spirv * Correct translation of field access for spirv * Push layouts to types for spirv * Spirv intrinsics * operator now makes a pointer * Add structured buffer of struct test * Preserve type layout in spirv structured buffer legalization * neaten * makeVectorFromScalar for SPIRV * placeholder for layouts on param groups * More type safe spirv op construction * Know that constants and types only go in one section * Remove emitTypeInst * Add todo for spirv sampling * Add links to spirv documentation on emit functions * OpTypeImage support for SPIR-V * Add simpler texture test for spirv * s/spirv_direct/spirv/g * Allow several string literals in target_intrinsic * Handle global params without a var layour for SPIR-V For example groupshared vars * uint spirv asm type * Add todo for isDefinition It is currently too broad * Some atomic op spirv intrinsics * Strip ConstantBuffer wrappers for spirv * Add todo for matrix annotations * Do not associate decorations insts with spirv counterparts * Correct entry point parameter generation * Spelling * Assert that fieldAddress is returning a pointer * Add error for existential type layout getting to spir-v emit * Add IRTupleTypeLayout Unused so far * Allow getElementPtr to work with vectors * Correct target name in test * Hide default spirv direct behind a premake option --default-spirv-direct=true * Do not insert space at start of intrinsic def * Correct asm rendering in tests * remove redundant option * Emit directly from direct test * Add source language options for spirv-dis * Add comments to spirv dis * Add dead debug print for before spirv module * Correct asm rendering in tests * s/spirv_direct/spirv/g * Only specialize intrinsic functions with predicates * regenerate vs projects * squash warnings * squash warnings * remove duplication * Silence warnings from msvc * squash warnings * Overload for zero sized array * More msvc warnings * warnings * Add spirv-tools to path for tests * Do not be specific about dxc version for diag test * Normalize line endings from spirv-dis * Correct filecheck matches * Temporarily disable two spirv tests Failing on CI, undebuggable hang :/ * Do not emit storage class more than once for spirv snippet * Do not pass spir-v to spirv-dis by stdin * Do not get spirv-dis output via stream, use file * normalize file endings in spirv-dis output
Diffstat (limited to 'source/slang/slang-ir.cpp')
-rw-r--r--source/slang/slang-ir.cpp62
1 files changed, 62 insertions, 0 deletions
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp
index 49c91dc22..131c8d407 100644
--- a/source/slang/slang-ir.cpp
+++ b/source/slang/slang-ir.cpp
@@ -959,6 +959,19 @@ namespace Slang
}
//
+ // IRTupleTypeLayout
+ //
+
+ void IRTupleTypeLayout::Builder::addAttrsImpl(List<IRInst*>& ioOperands)
+ {
+ auto irBuilder = getIRBuilder();
+ for(auto field : m_fields)
+ {
+ ioOperands.add(irBuilder->getTupleFieldLayoutAttr(field.layout));
+ }
+ }
+
+ //
// IRArrayTypeLayout
//
@@ -967,6 +980,15 @@ namespace Slang
ioOperands.add(m_elementTypeLayout);
}
+ //
+ // IRStructuredBufferTypeLayout
+ //
+
+ void IRStructuredBufferTypeLayout::Builder::addOperandsImpl(List<IRInst*>& ioOperands)
+ {
+ ioOperands.add(m_elementTypeLayout);
+ }
+
//
// IRPointerTypeLayout
//
@@ -4414,6 +4436,19 @@ namespace Slang
return inst;
}
+ IRVar* IRBuilder::emitVar(
+ IRType* type,
+ IRIntegerValue addressSpace)
+ {
+ auto allocatedType = getPtrType(kIROp_PtrType, type, addressSpace);
+ auto inst = createInst<IRVar>(
+ this,
+ kIROp_Var,
+ allocatedType);
+ addInst(inst);
+ return inst;
+ }
+
IRInst* IRBuilder::emitLoadReverseGradient(IRType* type, IRInst* diffValue)
{
auto inst = createInst<IRLoadReverseGradient>(
@@ -5669,6 +5704,18 @@ namespace Slang
operands));
}
+ IRTupleFieldLayoutAttr* IRBuilder::getTupleFieldLayoutAttr(
+ IRTypeLayout* layout)
+ {
+ IRInst* operands[] = { layout };
+
+ return cast<IRTupleFieldLayoutAttr>(createIntrinsicInst(
+ getVoidType(),
+ kIROp_TupleFieldLayoutAttr,
+ SLANG_COUNT_OF(operands),
+ operands));
+ }
+
IRCaseTypeLayoutAttr* IRBuilder::getCaseTypeLayoutAttr(
IRTypeLayout* layout)
{
@@ -7457,6 +7504,21 @@ namespace Slang
if (decorationCaps.isIncompatibleWith(targetCaps))
continue;
+ if(decoration->hasPredicate())
+ {
+ const auto scrutinee = decoration->getTypeScrutinee();
+ const auto predicate = decoration->getTypePredicate();
+ const auto predicateFun =
+ predicate == "boolean" ? [](auto t){ return t->getOp() == kIROp_BoolType; }
+ : predicate == "integral" ? isIntegralType
+ : predicate == "floating" ? isFloatingType
+ : nullptr;
+
+ SLANG_ASSERT(predicateFun);
+ if(!predicateFun(scrutinee))
+ continue;
+ }
+
if(!bestDecoration || decorationCaps.isBetterForTarget(bestCaps, targetCaps))
{
bestDecoration = decoration;