From 27ce5eb0de9f792f3e433bcb239c07d79371cf45 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 10 Sep 2021 16:31:26 -0400 Subject: First Slang LLVM integration (#1934) * #include an absolute path didn't work - because paths were taken to always be relative. * First integration with 'slang-llvm'. * Fix project. * Fix test output. * First pass assert support. * Add inline impls for min and max. * Add abs inline abs impl for llvm. * Make abs not use ternary op * Fix typo in slang-llvm.h * Sundary fixes to make remaining tests using llvm backend pass. --- tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected | 2 +- tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected b/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected index 73328c480..599e497f5 100644 --- a/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected +++ b/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected @@ -1,6 +1,6 @@ result code = 1 standard error = { -(1): error 100000: downstream tool name not known, allowed names are [ fxc, dxc, glslang, clang, visualstudio, gcc, genericcpp, nvrtc, downstream, linker ] +(1): error 100000: downstream tool name not known, allowed names are [ fxc, dxc, glslang, clang, visualstudio, gcc, genericcpp, nvrtc, llvm, downstream, linker ] tests/diagnostics/command-line/x-arg-tool-unknown.slang -entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc -Xthingy ^ } diff --git a/tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang b/tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang index c5fd93ca4..77e7c2050 100644 --- a/tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang +++ b/tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang @@ -1,4 +1,4 @@ -//TEST:COMPILE: -entry computeMain -stage compute -target dll tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang +//TEST:COMPILE: -entry computeMain -stage compute -target callable tests/hlsl-intrinsic/sampler-feedback/compute-sampler-feedback.slang // Not available on non PS shader // dx.op.writeSamplerFeedback WriteSamplerFeedback -- cgit v1.2.3