From 34a1ff5226a526cc17c5baecd63637f69c324fc7 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Sat, 22 May 2021 16:03:30 -0400 Subject: Improvements in -X support (#1852) * #include an absolute path didn't work - because paths were taken to always be relative. * Added SourceLoc handling for command line parsing. * Fix typo in debug. * Fix issue around the DiagnosticSink used in options parsing not having a writer available - by having DiagnosticSink parenting. * Small rename for clarity. * WIP extracting command line args for downstream tools. * Unit tests/bug fixes around extracting args. * Use DownstreamArgs in the EndToEndCompileRequest * Passing downstream compiler options downstream. * Fix issue with endToEndReq being nullptr. * Fix issue with diagnostics number change. * Small improvements to how the source line is displayed if it's too long. Default to 120, as suggested in previous review. * Make render test use x-args parsing and CommandArgReader. * Added missing diagnostics. * More DownstreamArgs to linkage so can be seen by 'components'. Added dxc-x-arg test. * Used combination of name and args instead of two Lists, which whilst equivalent was perhaps a little confusing. * Added documentation for -X support. * Added test for x-args parsing diagnostic. Improved diagnostic with list of known names. * Fix issues from merge. * Fix lookup for -matrix-layout-column-major in render test. * Remove commented out line. --- tests/diagnostics/command-line/x-arg-tool-unknown.slang | 3 +++ tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 tests/diagnostics/command-line/x-arg-tool-unknown.slang create mode 100644 tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected (limited to 'tests/diagnostics/command-line') diff --git a/tests/diagnostics/command-line/x-arg-tool-unknown.slang b/tests/diagnostics/command-line/x-arg-tool-unknown.slang new file mode 100644 index 000000000..cfcb09a12 --- /dev/null +++ b/tests/diagnostics/command-line/x-arg-tool-unknown.slang @@ -0,0 +1,3 @@ +// x-arg-tool-unknown.slang + +//DIAGNOSTIC_TEST:SIMPLE:-entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc -Xthingy diff --git a/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected b/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected new file mode 100644 index 000000000..73328c480 --- /dev/null +++ b/tests/diagnostics/command-line/x-arg-tool-unknown.slang.expected @@ -0,0 +1,8 @@ +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 ] +tests/diagnostics/command-line/x-arg-tool-unknown.slang -entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc -Xthingy + ^ +} +standard output = { +} -- cgit v1.2.3