encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-12 14:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

transform: Rename BoundArrayAccessors to Robustness

Browse Source 
We will want this transform to do more bounds and argument sanitization.

Bug: tint:748
Change-Id: I38cb9623622e9f5ab85d8cd420d669ca6be77099
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/56543
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Ben Clayton
2021-06-30 13:23:36 +00:00
committed by Tint LUCI CQ
parent 863e285013
commit 0273f1a604
12 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/transform/bound_array_accessors.cc → src/transform/robustness.cc
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/transform/bound_array_accessors.h"
#include "src/transform/robustness.h"
#include <algorithm>
#include <utility>
@@ -20,15 +20,15 @@
#include "src/program_builder.h"
#include "src/sem/expression.h"
TINT_INSTANTIATE_TYPEINFO(tint::transform::BoundArrayAccessors);
TINT_INSTANTIATE_TYPEINFO(tint::transform::Robustness);
namespace tint {
namespace transform {
BoundArrayAccessors::BoundArrayAccessors() = default;
BoundArrayAccessors::~BoundArrayAccessors() = default;
Robustness::Robustness() = default;
Robustness::~Robustness() = default;
void BoundArrayAccessors::Run(CloneContext& ctx, const DataMap&, DataMap&) {
void Robustness::Run(CloneContext& ctx, const DataMap&, DataMap&) {
ctx.ReplaceAll([&](ast::ArrayAccessorExpression* expr) {
return Transform(expr, &ctx);
});
@@ -36,7 +36,7 @@ void BoundArrayAccessors::Run(CloneContext& ctx, const DataMap&, DataMap&) {
ctx.Clone();
}
ast::ArrayAccessorExpression* BoundArrayAccessors::Transform(
ast::ArrayAccessorExpression* Robustness::Transform(
ast::ArrayAccessorExpression* expr,
CloneContext* ctx) {
auto& diags = ctx->dst->Diagnostics();

14
src/transform/bound_array_accessors.h → src/transform/robustness.h
View File

@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_TRANSFORM_BOUND_ARRAY_ACCESSORS_H_
#define SRC_TRANSFORM_BOUND_ARRAY_ACCESSORS_H_
#ifndef SRC_TRANSFORM_ROBUSTNESS_H_
#define SRC_TRANSFORM_ROBUSTNESS_H_
#include "src/ast/array_accessor_expression.h"
#include "src/transform/transform.h"
@@ -25,12 +25,12 @@ namespace transform {
/// the bounds of the array. Any access before the start of the array will clamp
/// to zero and any access past the end of the array will clamp to
/// (array length - 1).
class BoundArrayAccessors : public Castable<BoundArrayAccessors, Transform> {
class Robustness : public Castable<Robustness, Transform> {
public:
/// Constructor
BoundArrayAccessors();
Robustness();
/// Destructor
~BoundArrayAccessors() override;
~Robustness() override;
protected:
/// Runs the transform using the CloneContext built for transforming a
@@ -46,7 +46,9 @@ class BoundArrayAccessors : public Castable<BoundArrayAccessors, Transform> {
CloneContext* ctx);
};
using BoundArrayAccessors = Robustness;
} // namespace transform
} // namespace tint
#endif // SRC_TRANSFORM_BOUND_ARRAY_ACCESSORS_H_
#endif // SRC_TRANSFORM_ROBUSTNESS_H_

106
src/transform/bound_array_accessors_test.cc → src/transform/robustness_test.cc
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/transform/bound_array_accessors.h"
#include "src/transform/robustness.h"
#include "src/transform/test_helper.h"
@@ -20,9 +20,9 @@ namespace tint {
namespace transform {
namespace {
using BoundArrayAccessorsTest = TransformTest;
using RobustnessTest = TransformTest;
TEST_F(BoundArrayAccessorsTest, Ptrs_Clamp) {
TEST_F(RobustnessTest, Ptrs_Clamp) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -43,12 +43,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Array_Idx_Nested_Scalar) {
TEST_F(RobustnessTest, Array_Idx_Nested_Scalar) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -73,12 +73,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Array_Idx_Scalar) {
TEST_F(RobustnessTest, Array_Idx_Scalar) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -95,12 +95,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Array_Idx_Expr) {
TEST_F(RobustnessTest, Array_Idx_Expr) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -121,12 +121,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Array_Idx_Negative) {
TEST_F(RobustnessTest, Array_Idx_Negative) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -143,12 +143,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Array_Idx_OutOfBounds) {
TEST_F(RobustnessTest, Array_Idx_OutOfBounds) {
auto* src = R"(
var<private> a : array<f32, 3>;
@@ -165,12 +165,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Idx_Scalar) {
TEST_F(RobustnessTest, Vector_Idx_Scalar) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -187,12 +187,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Idx_Expr) {
TEST_F(RobustnessTest, Vector_Idx_Expr) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -213,12 +213,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Swizzle_Idx_Scalar) {
TEST_F(RobustnessTest, Vector_Swizzle_Idx_Scalar) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -235,12 +235,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Swizzle_Idx_Var) {
TEST_F(RobustnessTest, Vector_Swizzle_Idx_Var) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -261,11 +261,11 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Swizzle_Idx_Expr) {
TEST_F(RobustnessTest, Vector_Swizzle_Idx_Expr) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -286,12 +286,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Idx_Negative) {
TEST_F(RobustnessTest, Vector_Idx_Negative) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -308,12 +308,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Vector_Idx_OutOfBounds) {
TEST_F(RobustnessTest, Vector_Idx_OutOfBounds) {
auto* src = R"(
var<private> a : vec3<f32>;
@@ -330,12 +330,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_Scalar) {
TEST_F(RobustnessTest, Matrix_Idx_Scalar) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -352,12 +352,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_Expr_Column) {
TEST_F(RobustnessTest, Matrix_Idx_Expr_Column) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -378,12 +378,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_Expr_Row) {
TEST_F(RobustnessTest, Matrix_Idx_Expr_Row) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -404,12 +404,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_Negative_Column) {
TEST_F(RobustnessTest, Matrix_Idx_Negative_Column) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -426,12 +426,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_Negative_Row) {
TEST_F(RobustnessTest, Matrix_Idx_Negative_Row) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -448,12 +448,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_OutOfBounds_Column) {
TEST_F(RobustnessTest, Matrix_Idx_OutOfBounds_Column) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -470,12 +470,12 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
TEST_F(BoundArrayAccessorsTest, Matrix_Idx_OutOfBounds_Row) {
TEST_F(RobustnessTest, Matrix_Idx_OutOfBounds_Row) {
auto* src = R"(
var<private> a : mat3x2<f32>;
@@ -492,13 +492,13 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
// TODO(dsinclair): Implement when constant_id exists
TEST_F(BoundArrayAccessorsTest, DISABLED_Vector_Constant_Id_Clamps) {
TEST_F(RobustnessTest, DISABLED_Vector_Constant_Id_Clamps) {
// [[override(1300)]] let idx : i32;
// var a : vec3<f32>
// var b : f32 = a[idx]
@@ -507,7 +507,7 @@ TEST_F(BoundArrayAccessorsTest, DISABLED_Vector_Constant_Id_Clamps) {
}
// TODO(dsinclair): Implement when constant_id exists
TEST_F(BoundArrayAccessorsTest, DISABLED_Array_Constant_Id_Clamps) {
TEST_F(RobustnessTest, DISABLED_Array_Constant_Id_Clamps) {
// [[override(1300)]] let idx : i32;
// var a : array<f32, 4>
// var b : f32 = a[idx]
@@ -516,7 +516,7 @@ TEST_F(BoundArrayAccessorsTest, DISABLED_Array_Constant_Id_Clamps) {
}
// TODO(dsinclair): Implement when constant_id exists
TEST_F(BoundArrayAccessorsTest, DISABLED_Matrix_Column_Constant_Id_Clamps) {
TEST_F(RobustnessTest, DISABLED_Matrix_Column_Constant_Id_Clamps) {
// [[override(1300)]] let idx : i32;
// var a : mat3x2<f32>
// var b : f32 = a[idx][1]
@@ -525,7 +525,7 @@ TEST_F(BoundArrayAccessorsTest, DISABLED_Matrix_Column_Constant_Id_Clamps) {
}
// TODO(dsinclair): Implement when constant_id exists
TEST_F(BoundArrayAccessorsTest, DISABLED_Matrix_Row_Constant_Id_Clamps) {
TEST_F(RobustnessTest, DISABLED_Matrix_Row_Constant_Id_Clamps) {
// [[override(1300)]] let idx : i32;
// var a : mat3x2<f32>
// var b : f32 = a[1][idx]
@@ -533,7 +533,7 @@ TEST_F(BoundArrayAccessorsTest, DISABLED_Matrix_Row_Constant_Id_Clamps) {
// -> var b : f32 = a[1][min(u32(idx), 0, 1)]
}
TEST_F(BoundArrayAccessorsTest, RuntimeArray_Clamps) {
TEST_F(RobustnessTest, RuntimeArray_Clamps) {
auto* src = R"(
[[block]]
struct S {
@@ -561,24 +561,24 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}
// TODO(dsinclair): Clamp atomics when available.
TEST_F(BoundArrayAccessorsTest, DISABLED_Atomics_Clamp) {
TEST_F(RobustnessTest, DISABLED_Atomics_Clamp) {
FAIL();
}
// TODO(dsinclair): Clamp texture coord values. Depends on:
// https://github.com/gpuweb/gpuweb/issues/1107
TEST_F(BoundArrayAccessorsTest, DISABLED_TextureCoord_Clamp) {
TEST_F(RobustnessTest, DISABLED_TextureCoord_Clamp) {
FAIL();
}
// TODO(dsinclair): Test for scoped variables when Lexical Scopes implemented
TEST_F(BoundArrayAccessorsTest, DISABLED_Scoped_Variable) {
TEST_F(RobustnessTest, DISABLED_Scoped_Variable) {
// var a : array<f32, 3>;
// var i : u32;
// {
@@ -593,7 +593,7 @@ TEST_F(BoundArrayAccessorsTest, DISABLED_Scoped_Variable) {
}
// Check that existing use of min() and arrayLength() do not get renamed.
TEST_F(BoundArrayAccessorsTest, DontRenameSymbols) {
TEST_F(RobustnessTest, DontRenameSymbols) {
auto* src = R"(
[[block]]
struct S {
@@ -630,7 +630,7 @@ fn f() {
}
)";
auto got = Run<BoundArrayAccessors>(src);
auto got = Run<Robustness>(src);
EXPECT_EQ(expect, str(got));
}