mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-09 08:03:31 +00:00
c6b381495d
Replace the ShouldRun() method with Apply() which will do the transformation if it needs to be done, otherwise returns 'SkipTransform'. This reduces a bunch of duplicated scanning between the old ShouldRun() and Transform(). This change also adjusts code style to make the transforms more consistent. Change-Id: I9a6b10cb8b4ed62676b12ef30fb7764d363386c6 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/107681 Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
356 lines
7.7 KiB
C++
356 lines
7.7 KiB
C++
// Copyright 2021 The Tint Authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "src/tint/transform/binding_remapper.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "src/tint/transform/test_helper.h"
|
|
|
|
namespace tint::transform {
|
|
namespace {
|
|
|
|
using BindingRemapperTest = TransformTest;
|
|
|
|
TEST_F(BindingRemapperTest, ShouldRunEmptyRemappings) {
|
|
auto* src = R"()";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(BindingRemapper::BindingPoints{},
|
|
BindingRemapper::AccessControls{});
|
|
|
|
EXPECT_FALSE(ShouldRun<BindingRemapper>(src, data));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, ShouldRunBindingPointRemappings) {
|
|
auto* src = R"()";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{
|
|
{{2, 1}, {1, 2}},
|
|
},
|
|
BindingRemapper::AccessControls{});
|
|
|
|
EXPECT_TRUE(ShouldRun<BindingRemapper>(src, data));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, ShouldRunAccessControlRemappings) {
|
|
auto* src = R"()";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(BindingRemapper::BindingPoints{},
|
|
BindingRemapper::AccessControls{
|
|
{{2, 1}, ast::Access::kWrite},
|
|
});
|
|
|
|
EXPECT_TRUE(ShouldRun<BindingRemapper>(src, data));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, NoRemappings) {
|
|
auto* src = R"(
|
|
struct S {
|
|
a : f32,
|
|
}
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
auto* expect = src;
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(BindingRemapper::BindingPoints{},
|
|
BindingRemapper::AccessControls{});
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, RemapBindingPoints) {
|
|
auto* src = R"(
|
|
struct S {
|
|
a : f32,
|
|
};
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(
|
|
struct S {
|
|
a : f32,
|
|
}
|
|
|
|
@group(1) @binding(2) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{
|
|
{{2, 1}, {1, 2}}, // Remap
|
|
{{4, 5}, {6, 7}}, // Not found
|
|
// Keep @group(3) @binding(2) as is
|
|
},
|
|
BindingRemapper::AccessControls{});
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, RemapAccessControls) {
|
|
auto* src = R"(
|
|
struct S {
|
|
a : f32,
|
|
};
|
|
|
|
@group(2) @binding(1) var<storage, read_write> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read_write> b : S;
|
|
|
|
@group(4) @binding(3) var<storage, read> c : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(
|
|
struct S {
|
|
a : f32,
|
|
}
|
|
|
|
@group(2) @binding(1) var<storage, read_write> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read_write> b : S;
|
|
|
|
@group(4) @binding(3) var<storage, read> c : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{},
|
|
BindingRemapper::AccessControls{
|
|
{{2, 1}, ast::Access::kReadWrite}, // Modify access control
|
|
// Keep @group(3) @binding(2) as is
|
|
{{4, 3}, ast::Access::kRead}, // Add access control
|
|
});
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, RemapAll) {
|
|
auto* src = R"(
|
|
struct S {
|
|
a : f32,
|
|
};
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(
|
|
struct S {
|
|
a : f32,
|
|
}
|
|
|
|
@group(4) @binding(5) var<storage, read_write> a : S;
|
|
|
|
@group(6) @binding(7) var<storage, read_write> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{
|
|
{{2, 1}, {4, 5}},
|
|
{{3, 2}, {6, 7}},
|
|
},
|
|
BindingRemapper::AccessControls{
|
|
{{2, 1}, ast::Access::kReadWrite},
|
|
{{3, 2}, ast::Access::kReadWrite},
|
|
});
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, BindingCollisionsSameEntryPoint) {
|
|
auto* src = R"(
|
|
struct S {
|
|
i : i32,
|
|
};
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@group(4) @binding(3) var<storage, read> c : S;
|
|
|
|
@group(5) @binding(4) var<storage, read> d : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
let x : i32 = (((a.i + b.i) + c.i) + d.i);
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(
|
|
struct S {
|
|
i : i32,
|
|
}
|
|
|
|
@internal(disable_validation__binding_point_collision) @group(1) @binding(1) var<storage, read> a : S;
|
|
|
|
@internal(disable_validation__binding_point_collision) @group(1) @binding(1) var<storage, read> b : S;
|
|
|
|
@internal(disable_validation__binding_point_collision) @group(5) @binding(4) var<storage, read> c : S;
|
|
|
|
@internal(disable_validation__binding_point_collision) @group(5) @binding(4) var<storage, read> d : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
let x : i32 = (((a.i + b.i) + c.i) + d.i);
|
|
}
|
|
)";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{
|
|
{{2, 1}, {1, 1}},
|
|
{{3, 2}, {1, 1}},
|
|
{{4, 3}, {5, 4}},
|
|
},
|
|
BindingRemapper::AccessControls{}, true);
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, BindingCollisionsDifferentEntryPoints) {
|
|
auto* src = R"(
|
|
struct S {
|
|
i : i32,
|
|
};
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@group(4) @binding(3) var<storage, read> c : S;
|
|
|
|
@group(5) @binding(4) var<storage, read> d : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f1() {
|
|
let x : i32 = (a.i + c.i);
|
|
}
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f2() {
|
|
let x : i32 = (b.i + d.i);
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(
|
|
struct S {
|
|
i : i32,
|
|
}
|
|
|
|
@group(1) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(1) @binding(1) var<storage, read> b : S;
|
|
|
|
@group(5) @binding(4) var<storage, read> c : S;
|
|
|
|
@group(5) @binding(4) var<storage, read> d : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f1() {
|
|
let x : i32 = (a.i + c.i);
|
|
}
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f2() {
|
|
let x : i32 = (b.i + d.i);
|
|
}
|
|
)";
|
|
|
|
DataMap data;
|
|
data.Add<BindingRemapper::Remappings>(
|
|
BindingRemapper::BindingPoints{
|
|
{{2, 1}, {1, 1}},
|
|
{{3, 2}, {1, 1}},
|
|
{{4, 3}, {5, 4}},
|
|
},
|
|
BindingRemapper::AccessControls{}, true);
|
|
auto got = Run<BindingRemapper>(src, data);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
TEST_F(BindingRemapperTest, NoData) {
|
|
auto* src = R"(
|
|
struct S {
|
|
a : f32,
|
|
}
|
|
|
|
@group(2) @binding(1) var<storage, read> a : S;
|
|
|
|
@group(3) @binding(2) var<storage, read> b : S;
|
|
|
|
@compute @workgroup_size(1)
|
|
fn f() {
|
|
}
|
|
)";
|
|
|
|
auto* expect = R"(error: missing transform data for tint::transform::BindingRemapper)";
|
|
|
|
auto got = Run<BindingRemapper>(src);
|
|
|
|
EXPECT_EQ(expect, str(got));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace tint::transform
|