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 --- docs/command-line-slangc-reference.md | 8 ++++---- docs/design/stdlib-intrinsics.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/command-line-slangc-reference.md b/docs/command-line-slangc-reference.md index 8bd15bbee..862ed9022 100644 --- a/docs/command-line-slangc-reference.md +++ b/docs/command-line-slangc-reference.md @@ -550,9 +550,9 @@ Verify IR in the front-end. Experimental options (use at your own risk) - -## -emit-spirv-directly -Generate SPIR-V output directly (otherwise through GLSL and using the glslang compiler) + +## -emit-spirv-via-glsl +Generate SPIR-V output by generating and compiling GLSL using glslang @@ -852,7 +852,7 @@ A capability describes an optional feature that a target may or may not support. * `c` * `cpp` * `cuda` -* `spirv_direct` +* `spirv` * `GL_NV_ray_tracing` : enables the GL_NV_ray_tracing extension * `GL_EXT_ray_tracing` : enables the GL_EXT_ray_tracing extension * `GL_NV_fragment_shader_barycentric` : enables the GL_NV_fragment_shader_barycentric extension diff --git a/docs/design/stdlib-intrinsics.md b/docs/design/stdlib-intrinsics.md index 0aaa99057..76614beba 100644 --- a/docs/design/stdlib-intrinsics.md +++ b/docs/design/stdlib-intrinsics.md @@ -77,7 +77,7 @@ This is a widely used and somewhat complicated intrinsic. Placed on a declaratio * cuda - CUDA * cpp - C++ output (used for exe, shared-library or host-callable) -* spirv_direct - Used for slangs SPIR-V direct mechanism +* spirv - Used for slangs SPIR-V direct mechanism A function definition can have a `target_intrinsic` *and* a body. In that case, the body will be used for targets where the `target_intrinsic` isn't defined. -- cgit v1.2.3