From 4c78efd0c34442866f20e9d00bbb6908115c9a01 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 16 Nov 2023 14:32:33 -0800 Subject: Unify stdlib `Texture` types into one generic type. (#3327) * Unify Texture types in stdlib into 1 generic type. * Fixes. * Fix. * Fixes. * Fix reflection. * Fix binding reflection. * Add gather intrinsics. * Fix gather intrinsics. * Fix texture type toText. * Fix intrinsic. * fix cuda intrinsic. * Fix project files. * cleanup. * Fix. * Fix. * Fix sampler feedback test. * Fix getDimension intrinsics. * Fix spirv sample image intrinsics. * Fix test. * Fix GLSL intrinsic. * Cleanup. --------- Co-authored-by: Yong He --- source/slang/slang-emit.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'source/slang/slang-emit.cpp') diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp index 1ee5ba67c..bd7db604f 100644 --- a/source/slang/slang-emit.cpp +++ b/source/slang/slang-emit.cpp @@ -401,14 +401,16 @@ Result linkAndOptimizeIR( for (;;) { bool changed = false; - + auto b1 = dumpIRToString(irModule->getModuleInst()); dumpIRIfEnabled(codeGenContext, irModule, "BEFORE-SPECIALIZE"); if (!codeGenContext->isSpecializationDisabled()) changed |= specializeModule(irModule, codeGenContext->getSink()); if (codeGenContext->getSink()->getErrorCount() != 0) return SLANG_FAIL; dumpIRIfEnabled(codeGenContext, irModule, "AFTER-SPECIALIZE"); + auto b2 = dumpIRToString(irModule->getModuleInst()); + applySparseConditionalConstantPropagation(irModule, codeGenContext->getSink()); eliminateDeadCode(irModule); validateIRModuleIfEnabled(codeGenContext, irModule); @@ -420,9 +422,6 @@ Result linkAndOptimizeIR( // Unroll loops. if (codeGenContext->getSink()->getErrorCount() == 0) { - applySparseConditionalConstantPropagationForGlobalScope( - irModule, codeGenContext->getSink()); - if (!unrollLoopsInModule(irModule, codeGenContext->getSink())) return SLANG_FAIL; } @@ -587,11 +586,7 @@ Result linkAndOptimizeIR( sink); } - if(isKhronosTarget(targetRequest)) - { - // SPIR-V doesn't support 1-vectors - legalizeVectorTypes(irModule, sink); - } + legalizeVectorTypes(irModule, sink); // Once specialization and type legalization have been performed, // we should perform some of our basic optimization steps again, -- cgit v1.2.3