From 509bfd8bbaaf021507c4045b5fd9eaf43276dc0a Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:36:38 -0400 Subject: Simplify `CapabilitySet` Diagnostic Printing (#4678) Fixes: #4675 Fixes: #4683 Fixes: #4443 Fixes: #4585 Fixes: #4172 Made the following changes: 1. All capability diagnostic printing logic tries to simplify before printing. This means that we do not print atoms which imply another atom. 2. Do not print the `_` prefix part of atom names since it is misleading users on what they should use to solve a capability issue encountered. (`_Internal` `External` atom changes are not in this PR) 3. Bundle together printing of all sets which contain exactly the same atoms (excluding abstract atoms). This allows printing the following `vertex/fragment/hull/domain/... + glsl` instead of `vertex + glsl | fragment + glsl | hull + glsl | domain + glsl | ....` 4. Rework how entry-point errors are reported to users (example at bottom of PR comment) 5. Rework how atom-provenance data is collected to be leaner and more useful so we can rework the errors. There are 2 notable changes here: * We no longer store a list which describes where the first of an `CapabilityAtom` comes from. This heavily simplifies AST logic for the capability system. AST parsing of capabilities is much faster. The trade-off is faster AST parsing and correct AST node data for slower diagnostics if an error is found * atom-provenance data now stores a reference to an atom's use-site to provide information on **where** and **what** is wrong with user code versus only sharing **what** and not where. --- .../capability/capabilitySimplification3.slang | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/language-feature/capability/capabilitySimplification3.slang (limited to 'tests/language-feature/capability/capabilitySimplification3.slang') diff --git a/tests/language-feature/capability/capabilitySimplification3.slang b/tests/language-feature/capability/capabilitySimplification3.slang new file mode 100644 index 000000000..faf161d15 --- /dev/null +++ b/tests/language-feature/capability/capabilitySimplification3.slang @@ -0,0 +1,17 @@ +//TEST:SIMPLE(filecheck=CHECK): -target glsl -entry computeMain -stage compute -profile sm_5_0 +//TEST:SIMPLE(filecheck=CHECK_IGNORE_CAPS): -target glsl -emit-spirv-directly -entry computeMain -stage compute -profile sm_5_0 -ignore-capabilities + + +// CHECK_IGNORE_CAPS-NOT: error 36107 + +// CHECK: error 36107: entrypoint 'computeMain' does not support compilation target 'glsl' with stage 'compute' +// CHECK: capabilitySimplification3.slang(16): note: see using of 'WaveMultiPrefixProduct' +// CHECK-NOT: see using of 'WaveMultiPrefixProduct' +// CHECK: {{.*}}.meta.slang({{.*}}): note: see definition of 'WaveMultiPrefixProduct' +// CHECK: {{.*}}.meta.slang({{.*}}): note: see declaration of 'require' + +[numthreads(1,1,1)] +void computeMain() +{ + WaveMultiPrefixProduct(1, 0); +} -- cgit v1.2.3