encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint: s/analysing/analyzing 

Tint uses american spelling.

Change-Id: Ibd3b425cb217db5b43f20cc64c6f3876233ec16e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/105621
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton 2022-10-13 13:33:25 +00:00 committed by Dawn LUCI CQ
parent 51cc480b69
commit 4fe330fff4
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tint/resolver/address_space_validation_test.cc
View File

@ -61,7 +61,7 @@ TEST_F(ResolverAddressSpaceValidationTest, Private_RuntimeArrayInStruct) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space
note: while analysing structure member S.m note: while analyzing structure member S.m
12:34 note: while instantiating 'var' v)"); 12:34 note: while instantiating 'var' v)");
} }
@ -81,7 +81,7 @@ TEST_F(ResolverAddressSpaceValidationTest, Workgroup_RuntimeArrayInStruct) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space
note: while analysing structure member S.m note: while analyzing structure member S.m
12:34 note: while instantiating 'var' v)"); 12:34 note: while instantiating 'var' v)");
} }
@ -317,7 +317,7 @@ TEST_F(ResolverAddressSpaceValidationTest, UniformBuffer_Struct_Runtime) {
ASSERT_FALSE(r()->Resolve()); ASSERT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
R"(56:78 error: runtime-sized arrays can only be used in the <storage> address space R"(56:78 error: runtime-sized arrays can only be used in the <storage> address space
note: while analysing structure member S.m note: while analyzing structure member S.m
56:78 note: while instantiating 'var' svar)"); 56:78 note: while instantiating 'var' svar)");
} }

2
src/tint/resolver/attribute_validation_test.cc
View File

@ -1433,7 +1433,7 @@ TEST_F(InterpolateTest, VertexOutput_Integer_MissingFlatInterpolation) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(12:34 error: integral user-defined vertex outputs must have a flat interpolation attribute R"(12:34 error: integral user-defined vertex outputs must have a flat interpolation attribute
note: while analysing entry point 'main')"); note: while analyzing entry point 'main')");
} }
TEST_F(InterpolateTest, MissingLocationAttribute_Parameter) { TEST_F(InterpolateTest, MissingLocationAttribute_Parameter) {

2
src/tint/resolver/builtins_validation_test.cc
View File

@ -204,7 +204,7 @@ TEST_F(ResolverBuiltinsValidationTest, FragDepthIsInputStruct_Fail) {
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: builtin(frag_depth) cannot be used in input of " "12:34 error: builtin(frag_depth) cannot be used in input of "
"fragment pipeline stage\n" "fragment pipeline stage\n"
"note: while analysing entry point 'fragShader'"); "note: while analyzing entry point 'fragShader'");
} }
TEST_F(ResolverBuiltinsValidationTest, StructBuiltinInsideEntryPoint_Ignored) { TEST_F(ResolverBuiltinsValidationTest, StructBuiltinInsideEntryPoint_Ignored) {

22
src/tint/resolver/entry_point_validation_test.cc
View File

@ -170,7 +170,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMultipleAttribu
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes
13:43 note: previously consumed location(0) 13:43 note: previously consumed location(0)
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMissingAttribute) { TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMissingAttribute) {
@ -198,7 +198,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_MemberMissingAttribut
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
R"(14:52 error: missing entry point IO attribute R"(14:52 error: missing entry point IO attribute
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_DuplicateBuiltins) { TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_DuplicateBuiltins) {
@ -227,7 +227,7 @@ TEST_F(ResolverEntryPointValidationTest, ReturnType_Struct_DuplicateBuiltins) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(12:34 error: builtin(frag_depth) attribute appears multiple times as pipeline output R"(12:34 error: builtin(frag_depth) attribute appears multiple times as pipeline output
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, ParameterAttribute_Location) { TEST_F(ResolverEntryPointValidationTest, ParameterAttribute_Location) {
@ -339,7 +339,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMultipleAttribut
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes EXPECT_EQ(r()->error(), R"(14:52 error: multiple entry point IO attributes
13:43 note: previously consumed location(0) 13:43 note: previously consumed location(0)
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMissingAttribute) { TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMissingAttribute) {
@ -366,7 +366,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_MemberMissingAttribute
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), R"(14:52 error: missing entry point IO attribute EXPECT_EQ(r()->error(), R"(14:52 error: missing entry point IO attribute
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, Parameter_DuplicateBuiltins) { TEST_F(ResolverEntryPointValidationTest, Parameter_DuplicateBuiltins) {
@ -432,7 +432,7 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_DuplicateBuiltins) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(12:34 error: builtin(sample_index) attribute appears multiple times as pipeline input R"(12:34 error: builtin(sample_index) attribute appears multiple times as pipeline input
12:34 note: while analysing entry point 'main')"); 12:34 note: while analyzing entry point 'main')");
} }
TEST_F(ResolverEntryPointValidationTest, VertexShaderMustReturnPosition) { TEST_F(ResolverEntryPointValidationTest, VertexShaderMustReturnPosition) {
@ -873,7 +873,7 @@ TEST_F(LocationAttributeTests, BadType_Input_Struct_NestedStruct) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"14:52 error: nested structures cannot be used for entry point IO\n" "14:52 error: nested structures cannot be used for entry point IO\n"
"12:34 note: while analysing entry point 'main'"); "12:34 note: while analyzing entry point 'main'");
} }
TEST_F(LocationAttributeTests, BadType_Input_Struct_RuntimeArray) { TEST_F(LocationAttributeTests, BadType_Input_Struct_RuntimeArray) {
@ -1059,7 +1059,7 @@ TEST_F(LocationAttributeTests, ReturnType_Struct_NestedStruct) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"14:52 error: nested structures cannot be used for entry point IO\n" "14:52 error: nested structures cannot be used for entry point IO\n"
"12:34 note: while analysing entry point 'main'"); "12:34 note: while analyzing entry point 'main'");
} }
TEST_F(LocationAttributeTests, ReturnType_Struct_RuntimeArray) { TEST_F(LocationAttributeTests, ReturnType_Struct_RuntimeArray) {
@ -1140,7 +1140,7 @@ TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Output) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: attribute is not valid for compute shader output\n" "12:34 error: attribute is not valid for compute shader output\n"
"56:78 note: while analysing entry point 'main'"); "56:78 note: while analyzing entry point 'main'");
} }
TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Input) { TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Input) {
@ -1159,7 +1159,7 @@ TEST_F(LocationAttributeTests, ComputeShaderLocationStructMember_Input) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: attribute is not valid for compute shader inputs\n" "12:34 error: attribute is not valid for compute shader inputs\n"
"56:78 note: while analysing entry point 'main'"); "56:78 note: while analyzing entry point 'main'");
} }
TEST_F(LocationAttributeTests, Duplicate_input) { TEST_F(LocationAttributeTests, Duplicate_input) {
@ -1219,7 +1219,7 @@ TEST_F(LocationAttributeTests, Duplicate_struct) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"34:56 error: location(1) attribute appears multiple times\n" "34:56 error: location(1) attribute appears multiple times\n"
"12:34 note: while analysing entry point 'main'"); "12:34 note: while analyzing entry point 'main'");
} }
} // namespace } // namespace

14
src/tint/resolver/host_shareable_validation_test.cc
View File

@ -36,7 +36,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolMember) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable
12:34 note: while analysing structure member S.x 12:34 note: while analyzing structure member S.x
56:78 note: while instantiating 'var' g)"); 56:78 note: while instantiating 'var' g)");
} }
@ -51,7 +51,7 @@ TEST_F(ResolverHostShareableValidationTest, BoolVectorMember) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(56:78 error: Type 'vec3<bool>' cannot be used in address space 'storage' as it is non-host-shareable R"(56:78 error: Type 'vec3<bool>' cannot be used in address space 'storage' as it is non-host-shareable
12:34 note: while analysing structure member S.x 12:34 note: while analyzing structure member S.x
56:78 note: while instantiating 'var' g)"); 56:78 note: while instantiating 'var' g)");
} }
@ -67,7 +67,7 @@ TEST_F(ResolverHostShareableValidationTest, Aliases) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable R"(56:78 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable
12:34 note: while analysing structure member S.x 12:34 note: while analyzing structure member S.x
56:78 note: while instantiating 'var' g)"); 56:78 note: while instantiating 'var' g)");
} }
@ -86,10 +86,10 @@ TEST_F(ResolverHostShareableValidationTest, NestedStructures) {
EXPECT_EQ( EXPECT_EQ(
r()->error(), r()->error(),
R"(9:10 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable R"(9:10 error: Type 'bool' cannot be used in address space 'storage' as it is non-host-shareable
1:2 note: while analysing structure member I1.x 1:2 note: while analyzing structure member I1.x
3:4 note: while analysing structure member I2.y 3:4 note: while analyzing structure member I2.y
5:6 note: while analysing structure member I3.z 5:6 note: while analyzing structure member I3.z
7:8 note: while analysing structure member S.m 7:8 note: while analyzing structure member S.m
9:10 note: while instantiating 'var' g)"); 9:10 note: while instantiating 'var' g)");
} }

4
src/tint/resolver/resolver.cc
View File

@ -2768,7 +2768,7 @@ sem::Struct* Resolver::Structure(const ast::Struct* str) {
// For alignment, use the alignment attribute if provided, otherwise use the // For alignment, use the alignment attribute if provided, otherwise use the
// default alignment for the member type. // default alignment for the member type.
// Diagnostic errors are raised if a basic rule is violated. // Diagnostic errors are raised if a basic rule is violated.
// Validation of storage-class rules requires analysing the actual variable // Validation of storage-class rules requires analyzing the actual variable
// usage of the structure, and so is performed as part of the variable // usage of the structure, and so is performed as part of the variable
// validation. // validation.
uint64_t struct_size = 0; uint64_t struct_size = 0;
@ -3238,7 +3238,7 @@ bool Resolver::ApplyAddressSpaceUsageToType(ast::AddressSpace address_space,
if (!ApplyAddressSpaceUsageToType(address_space, const_cast<sem::Type*>(member->Type()), if (!ApplyAddressSpaceUsageToType(address_space, const_cast<sem::Type*>(member->Type()),
usage)) { usage)) {
std::stringstream err; std::stringstream err;
err << "while analysing structure member " << sem_.TypeNameOf(str) << "." err << "while analyzing structure member " << sem_.TypeNameOf(str) << "."
<< builder_->Symbols().NameFor(member->Declaration()->symbol); << builder_->Symbols().NameFor(member->Declaration()->symbol);
AddNote(err.str(), member->Declaration()->source); AddNote(err.str(), member->Declaration()->source);
return false; return false;

2
src/tint/resolver/validator.cc
View File

@ -1299,7 +1299,7 @@ bool Validator::EntryPoint(const sem::Function* func, ast::PipelineStage stage)
member->Declaration()->attributes, member->Type(), member->Declaration()->attributes, member->Type(),
member->Declaration()->source, param_or_ret, member->Declaration()->source, param_or_ret,
/*is_struct_member*/ true, member->Location())) { /*is_struct_member*/ true, member->Location())) {
AddNote("while analysing entry point '" + symbols_.NameFor(decl->symbol) + "'", AddNote("while analyzing entry point '" + symbols_.NameFor(decl->symbol) + "'",
decl->source); decl->source);
return false; return false;
} }

2
src/tint/resolver/variable_validation_test.cc
View File

@ -329,7 +329,7 @@ TEST_F(ResolverVariableValidationTest, NonConstructibleType_RuntimeArray) {
EXPECT_FALSE(r()->Resolve()); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space R"(12:34 error: runtime-sized arrays can only be used in the <storage> address space
56:78 note: while analysing structure member S.m 56:78 note: while analyzing structure member S.m
12:34 note: while instantiating 'var' v)"); 12:34 note: while instantiating 'var' v)");
} }