From 00bd481e001e8c0b8008eaff5a38fa37963e6f99 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 15 Aug 2023 20:28:42 +0800 Subject: 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 --- source/slang/slang-spirv-val.cpp | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'source/slang/slang-spirv-val.cpp') diff --git a/source/slang/slang-spirv-val.cpp b/source/slang/slang-spirv-val.cpp index 54bf5348b..c2381fa0e 100644 --- a/source/slang/slang-spirv-val.cpp +++ b/source/slang/slang-spirv-val.cpp @@ -3,27 +3,44 @@ namespace Slang { -SlangResult debugDisassembleSPIRV(const List& spirv, String& outDis) +static SlangResult disassembleSPIRV(const List& spirv, String& outErr, String& outDis) { + // Set up our process CommandLine commandLine; commandLine.m_executableLocation.setName("spirv-dis"); RefPtr p; - const auto createResult = Process::create(commandLine, 0, p); + // If we failed to even start the process, then validation isn't available - SLANG_RETURN_ON_FAIL(createResult); + SLANG_RETURN_ON_FAIL(Process::create(commandLine, 0, p)); const auto in = p->getStream(StdStreamType::In); const auto out = p->getStream(StdStreamType::Out); + const auto err = p->getStream(StdStreamType::ErrorOut); + // Write the assembly SLANG_RETURN_ON_FAIL(in->write(spirv.getBuffer(), spirv.getCount())); in->close(); + // Wait for it to finish - if (!p->waitForTermination(1000)) + if(!p->waitForTermination(1000)) return SLANG_FAIL; + // TODO: allow inheriting stderr in Process List outData; SLANG_RETURN_ON_FAIL(StreamUtil::readAll(out, 0, outData)); - outDis = String((const char*)outData.getBuffer()); - return SLANG_OK; + outErr = String( + reinterpret_cast(outData.begin()), + reinterpret_cast(outData.end()) + ); + + outData.clear(); + SLANG_RETURN_ON_FAIL(StreamUtil::readAll(err, 0, outData)); + outDis = String( + reinterpret_cast(outData.begin()), + reinterpret_cast(outData.end()) + ); + + const auto ret = p->getReturnValue(); + return ret == 0 ? SLANG_OK : SLANG_FAIL; } SlangResult debugValidateSPIRV(const List& spirv) @@ -57,10 +74,13 @@ SlangResult debugValidateSPIRV(const List& spirv) SLANG_RETURN_ON_FAIL(StreamUtil::readAll(err, 0, outData)); fwrite(outData.getBuffer(), outData.getCount(), 1, stderr); const auto ret = p->getReturnValue(); - if (SLANG_FAILED(ret)) + + if(ret != 0) { + String spirvDisErr; String spirvDis; - debugDisassembleSPIRV(spirv, spirvDis); + disassembleSPIRV(spirv, spirvDisErr, spirvDis); + fwrite(spirvDisErr.getBuffer(), spirvDisErr.getLength(), 1, stderr); fwrite(spirvDis.getBuffer(), spirvDis.getLength(), 1, stderr); } -- cgit v1.2.3