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.

Sign up for GitHub

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

Jump to bottom

WGSL storage address space should always correspond to MSL device add… #1711

Merged
merged 4 commits into from
Feb 3, 2022
Merged

WGSL storage address space should always correspond to MSL device add… #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8412b29
WGSL storage address space should always correspond to MSL device add…
wtholliday Feb 2, 2022
ffb3bd2
Update baselines
wtholliday Feb 3, 2022
773f112
Add error for storage address space if MSL version < 2.
wtholliday Feb 3, 2022
f4be386
Update default MSL version to 2.0.
wtholliday Feb 3, 2022
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
4 changes: 3 additions & 1 deletion src/back/msl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ pub enum Error {
UnsupportedBuiltIn(crate::BuiltIn),
#[error("capability {0:?} is not supported")]
CapabilityNotSupported(crate::valid::Capabilities),
#[error("address space {0:?} is not supported for target MSL version")]
UnsupportedAddressSpace(crate::AddressSpace),
}

#[derive(Clone, Debug, PartialEq, thiserror::Error)]
Expand Down Expand Up @@ -185,7 +187,7 @@ pub struct Options {
impl Default for Options {
fn default() -> Self {
Options {
lang_version: (1, 1),
lang_version: (2, 0),
per_stage_map: PerStageMap::default(),
inline_samplers: Vec::new(),
spirv_cross_compatibility: false,
Expand Down
8 changes: 4 additions & 4 deletions src/back/msl/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,7 @@ impl crate::AddressSpace {
match self {
Self::Handle => None,
Self::Uniform | Self::PushConstant => Some("constant"),
Self::Storage { access } if access.contains(crate::StorageAccess::STORE) => {
Some("device")
}
Self::Storage { .. } => Some("constant"),
Self::Storage { .. } => Some("device"),
Self::Private | Self::Function => Some("thread"),
Self::WorkGroup => Some("threadgroup"),
}
Expand Down Expand Up @@ -3033,6 +3030,9 @@ impl<W: Write> Writer<W> {
options.resolve_push_constants(ep.stage).ok()
}
crate::AddressSpace::WorkGroup => None,
crate::AddressSpace::Storage { .. } if options.lang_version < (2, 0) => {
return Err(Error::UnsupportedAddressSpace(var.space))
}
_ => options
.resolve_resource_binding(ep.stage, var.binding.as_ref().unwrap())
.ok(),
Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/boids.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct main_Input {
kernel void main_(
metal::uint3 global_invocation_id [[thread_position_in_grid]]
, constant SimParams& params [[buffer(0)]]
, constant Particles& particlesSrc [[buffer(1)]]
, device Particles& particlesSrc [[buffer(1)]]
, device Particles& particlesDst [[buffer(2)]]
, constant _mslBufferSizes& _buffer_sizes [[buffer(3)]]
) {
Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/bounds-check-restrict.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/bounds-check-zero-atomic.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/bounds-check-zero.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/collatz.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/control-flow.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/empty-global-name.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/empty.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/functions.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
4 changes: 2 additions & 2 deletions tests/out/msl/globals.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand All @@ -22,7 +22,7 @@ struct type_8 {
kernel void main_(
threadgroup type_2& wg
, threadgroup metal::atomic_uint& at_1
, constant Foo& alignment [[user(fake0)]]
, device Foo& alignment [[user(fake0)]]
) {
float Foo_1 = 1.0;
bool at = true;
Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/image.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/interface.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/interpolate.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/math-functions.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/operators.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
4 changes: 2 additions & 2 deletions tests/out/msl/policy-mix.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down Expand Up @@ -34,7 +34,7 @@ metal::float4 mock_function(
metal::int2 c,
int i,
int l,
constant InStorage& in_storage,
device InStorage& in_storage,
constant InUniform& in_uniform,
metal::texture2d_array<float, metal::access::sample> image_2d_array,
threadgroup type_5 const& in_workgroup,
Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/quad-vert.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/quad.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
4 changes: 2 additions & 2 deletions tests/out/msl/shadow.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down Expand Up @@ -46,7 +46,7 @@ struct fs_mainOutput {
fragment fs_mainOutput fs_main(
fs_mainInput varyings [[stage_in]]
, constant Globals& u_globals [[user(fake0)]]
, constant Lights& s_lights [[user(fake0)]]
, device Lights& s_lights [[user(fake0)]]
, metal::depth2d_array<float, metal::access::sample> t_shadow [[user(fake0)]]
, metal::sampler sampler_shadow [[user(fake0)]]
) {
Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/standard.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/out/msl/texture-arg.msl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// language: metal1.1
// language: metal2.0
#include <metal_stdlib>
#include <simd/simd.h>

Expand Down