Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused attributes from storage class #807

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions crates/rustc_codegen_spirv/src/symbols.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,9 @@ const BUILTINS: &[(&str, BuiltIn)] = {
const STORAGE_CLASSES: &[(&str, StorageClass)] = {
use StorageClass::*;
&[
("uniform_constant", UniformConstant),
("input", Input),
("uniform", Uniform),
("output", Output),
("workgroup", Workgroup),
("cross_workgroup", CrossWorkgroup),
("private", Private),
("function", Function),
("generic", Generic),
("push_constant", PushConstant),
("atomic_counter", AtomicCounter),
("image", Image),
Expand Down
7 changes: 7 additions & 0 deletions tests/ui/arch/all_memory_barrier.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want this error to be here :P Do you have spirv-val installed and in your $PATH?

|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/all_memory_barrier.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 72 4
OpMemoryBarrier %6 %7
OpLine %8 9 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/arch/all_memory_barrier_with_group_sync.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/all_memory_barrier_with_group_sync.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 38 4
OpControlBarrier %6 %7 %8
OpLine %9 9 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/arch/device_memory_barrier.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/device_memory_barrier.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 72 4
OpMemoryBarrier %6 %7
OpLine %8 9 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/arch/device_memory_barrier_with_group_sync.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/device_memory_barrier_with_group_sync.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 38 4
OpControlBarrier %6 %7 %8
OpLine %9 9 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/arch/workgroup_memory_barrier.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/workgroup_memory_barrier.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 72 4
OpMemoryBarrier %6 %7
OpLine %8 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/arch/workgroup_memory_barrier_with_group_sync.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/arch/workgroup_memory_barrier_with_group_sync.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 38 4
OpControlBarrier %6 %6 %7
OpLine %8 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/add_two_ints.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/add_two_ints.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %2
%5 = OpFunctionParameter %2
Expand All @@ -7,3 +12,5 @@ OpLine %7 7 4
OpLine %7 8 1
OpReturnValue %8
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/asm.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/asm.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 8 8
OpMemoryBarrier %6 %7
OpLine %5 15 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/asm_add_two_ints.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/asm_add_two_ints.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %2
%5 = OpFunctionParameter %2
Expand All @@ -7,3 +12,5 @@ OpLine %7 9 8
OpLine %7 17 1
OpReturnValue %8
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/asm_op_decorate.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/asm_op_decorate.stage-id.spv.dir/module`

OpCapability Float64
OpCapability Int16
OpCapability Int64
Expand Down Expand Up @@ -27,3 +32,5 @@ OpDecorate %6 Binding 0
%14 = OpTypePointer UniformConstant %5
%6 = OpVariable %14 UniformConstant
%15 = OpTypePointer UniformConstant %13
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/complex_image_sample_inst.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/complex_image_sample_inst.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %2
%5 = OpFunctionParameter %6
Expand All @@ -12,3 +17,5 @@ OpLine %12 17 8
OpLine %12 57 1
OpReturnValue %19
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/custom_entry_point.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/custom_entry_point.stage-id.spv.dir/module`

OpCapability Float64
OpCapability Int16
OpCapability Int64
Expand All @@ -12,3 +17,5 @@ OpExecutionMode %1 OriginUpperLeft
OpName %3 "custom_entry_point::main"
%4 = OpTypeVoid
%5 = OpTypeFunction %4
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/entry-pass-mode-cast-array.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/entry-pass-mode-cast-array.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 13 12
Expand All @@ -11,3 +16,5 @@ OpStore %14 %13
OpLine %5 16 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/generic-fn-op-name.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/generic-fn-op-name.stage-id.spv.dir/module`

OpCapability Float64
OpCapability Int16
OpCapability Int64
Expand All @@ -13,3 +18,5 @@ OpName %3 "generic_fn_op_name::generic::<f32, {spirv_types::image_params::Dimens
OpName %4 "generic_fn_op_name::main"
%5 = OpTypeVoid
%6 = OpTypeFunction %5
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/index_user_dst.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/index_user_dst.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 7 12
Expand Down Expand Up @@ -32,3 +37,5 @@ OpUnreachable
%14 = OpLabel
OpUnreachable
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/issue-373.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/issue-373.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 22 11
Expand All @@ -9,3 +14,5 @@ OpStore %11 %9
OpLine %5 23 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

12 changes: 12 additions & 0 deletions tests/ui/dis/issue-723-output.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
warning: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-opt failed, leaving as unoptimized
= note: module `$TEST_BUILD_DIR/dis/issue-723-output.stage-id.spv.dir/module`

error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/issue-723-output.stage-id.spv.dir/module`

OpCapability Float64
OpCapability Int16
OpCapability Int64
Expand All @@ -17,3 +27,5 @@ OpDecorate %2 Location 0
%8 = OpTypePointer Output %7
%9 = OpTypeFunction %5
%2 = OpVariable %8 Output
error: aborting due to previous error; 1 warning emitted

7 changes: 7 additions & 0 deletions tests/ui/dis/issue-731.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/issue-731.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 11 12
Expand All @@ -11,3 +16,5 @@ OpStore %14 %13
OpLine %5 14 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/pass-mode-cast-struct.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/pass-mode-cast-struct.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpLabel
OpLine %5 27 12
Expand All @@ -20,3 +25,5 @@ OpStore %20 %19
OpLine %5 30 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/ptr_copy.via_intrinsic.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/ptr_copy.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5
Expand All @@ -7,3 +12,5 @@ OpCopyMemory %6 %4
OpLine %8 30 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/ptr_read.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/ptr_read.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5
Expand All @@ -9,3 +14,5 @@ OpStore %6 %9
OpLine %11 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/ptr_read_method.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/ptr_read_method.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5
Expand All @@ -9,3 +14,5 @@ OpStore %6 %9
OpLine %11 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/ptr_write.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/ptr_write.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5
Expand All @@ -9,3 +14,5 @@ OpStore %6 %9
OpLine %8 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/ptr_write_method.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/ptr_write_method.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5
Expand All @@ -9,3 +14,5 @@ OpStore %6 %9
OpLine %8 8 1
OpReturn
OpFunctionEnd
error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui/dis/unroll_loops.stderr
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
error: error:0:0 - failed spawn executable: No such file or directory (os error 2)
|
= note: spirv-val failed
= note: module `$TEST_BUILD_DIR/dis/unroll_loops.stage-id.spv.dir/module`

%1 = OpFunction %2 None %3
%4 = OpFunctionParameter %2
%5 = OpFunctionParameter %2
Expand Down Expand Up @@ -38,3 +43,5 @@ OpBranch %9
%21 = OpLabel
OpUnreachable
OpFunctionEnd
error: aborting due to previous error

Loading