AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
30d3d1ab19
skia2/tests/SkSLMemoryLayoutTest.cpp
Kevin Lubick 08ece0c9a0 [includes] Enforce IWYU on sksl code 
PS1 regenerates the Bazel files. Use it as the base change when
    comparing patchsets.

IWYU seems to do a good job of working with MyFile.cpp and
MyFile.h, but if there is just a MyHeader.h, it doesn't always
seem to throw errors if the includes aren't correct. This was
observed with include/sksl/DSL.h This might be due to the fact
that headers are not compiled on their own, so they are never
sent directly to the IWYU binary.

This change sets enforce_iwyu_on_package() on the all sksl
packages and then fixes the includes until all those checks
are happy. There were a few files that needed fixes outside
of the sksl folder. Examples include:
 - src/gpu/effects/GrConvexPolyEffect.cpp
 - tests/SkSLDSLTest.cpp

To really enforce this, we need to add a CI/CQ job that runs
bazel build //example:hello_world_gl --config=clang \
  --sandbox_base=/dev/shm --features skia_enforce_iwyu

If that failed, a dev could make the changes described in
the logs and/or run the command locally to see those
prescribed fixes.

I had to add several entries to toolchain/IWYU_mapping.imp
in order to fix some private includes and other atypical
choices. I tried adding a rule there to allow inclusion of
SkTypes.h to make sure defines like SK_SUPPORT_GPU, but
could not get it to work for all cases, so I deferred to
using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h)

Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06
Bug: skia:13052
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-21 12:43:02 +00:00

207 lines
10 KiB
C++
Raw Blame History

/*
* Copyright 2016 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "include/private/SkSLModifiers.h"
#include "include/sksl/SkSLErrorReporter.h"
#include "include/sksl/SkSLPosition.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
#include "src/sksl/SkSLMangler.h"
#include "src/sksl/SkSLMemoryLayout.h"
#include "src/sksl/SkSLUtil.h"
#include "src/sksl/ir/SkSLType.h"
#include "tests/Test.h"
#include <memory>
#include <string>
#include <string_view>
#include <vector>
DEF_TEST(SkSLMemoryLayout140Test, r) {
SkSL::TestingOnly_AbortErrorReporter errors;
SkSL::ShaderCaps caps;
SkSL::Mangler mangler;
SkSL::Context context(errors, caps, mangler);
SkSL::MemoryLayout layout(SkSL::MemoryLayout::k140_Standard);
// basic types
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fFloat));
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fFloat2));
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fFloat3));
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat4));
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fInt));
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fInt2));
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fInt3));
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fInt4));
REPORTER_ASSERT(r, 1 == layout.size(*context.fTypes.fBool));
REPORTER_ASSERT(r, 2 == layout.size(*context.fTypes.fBool2));
REPORTER_ASSERT(r, 3 == layout.size(*context.fTypes.fBool3));
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fBool4));
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x2));
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x4));
REPORTER_ASSERT(r, 48 == layout.size(*context.fTypes.fFloat3x3));
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x2));
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x4));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fFloat));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fInt));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fInt2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt3));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt4));
REPORTER_ASSERT(r, 1 == layout.alignment(*context.fTypes.fBool));
REPORTER_ASSERT(r, 2 == layout.alignment(*context.fTypes.fBool2));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool3));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool4));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x4));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3x3));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x4));
// struct 1
std::vector<SkSL::Type::Field> fields1;
fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fFloat3.get());
std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(SkSL::Position(),
std::string("s1"), fields1);
REPORTER_ASSERT(r, 16 == layout.size(*s1));
REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s2"),
fields1);
REPORTER_ASSERT(r, 16 == layout.size(*s2));
REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s3"),
fields1);
REPORTER_ASSERT(r, 32 == layout.size(*s3));
REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
// struct 2
std::vector<SkSL::Type::Field> fields2;
fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s4"),
fields2);
REPORTER_ASSERT(r, 16 == layout.size(*s4));
REPORTER_ASSERT(r, 16 == layout.alignment(*s4));
fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat3.get());
std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s5"),
fields2);
REPORTER_ASSERT(r, 32 == layout.size(*s5));
REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
// arrays
std::unique_ptr<SkSL::Type> array1 =
SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
REPORTER_ASSERT(r, 64 == layout.size(*array1));
REPORTER_ASSERT(r, 16 == layout.alignment(*array1));
REPORTER_ASSERT(r, 16 == layout.stride(*array1));
std::unique_ptr<SkSL::Type> array2 =
SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
REPORTER_ASSERT(r, 64 == layout.size(*array2));
REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
REPORTER_ASSERT(r, 16 == layout.stride(*array2));
}
DEF_TEST(SkSLMemoryLayout430Test, r) {
SkSL::TestingOnly_AbortErrorReporter errors;
SkSL::ShaderCaps caps;
SkSL::Mangler mangler;
SkSL::Context context(errors, caps, mangler);
SkSL::MemoryLayout layout(SkSL::MemoryLayout::k430_Standard);
// basic types
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fFloat));
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fFloat2));
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fFloat3));
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat4));
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fInt));
REPORTER_ASSERT(r, 8 == layout.size(*context.fTypes.fInt2));
REPORTER_ASSERT(r, 12 == layout.size(*context.fTypes.fInt3));
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fInt4));
REPORTER_ASSERT(r, 1 == layout.size(*context.fTypes.fBool));
REPORTER_ASSERT(r, 2 == layout.size(*context.fTypes.fBool2));
REPORTER_ASSERT(r, 3 == layout.size(*context.fTypes.fBool3));
REPORTER_ASSERT(r, 4 == layout.size(*context.fTypes.fBool4));
REPORTER_ASSERT(r, 16 == layout.size(*context.fTypes.fFloat2x2));
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat2x4));
REPORTER_ASSERT(r, 48 == layout.size(*context.fTypes.fFloat3x3));
REPORTER_ASSERT(r, 32 == layout.size(*context.fTypes.fFloat4x2));
REPORTER_ASSERT(r, 64 == layout.size(*context.fTypes.fFloat4x4));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fFloat));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fInt));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fInt2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt3));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fInt4));
REPORTER_ASSERT(r, 1 == layout.alignment(*context.fTypes.fBool));
REPORTER_ASSERT(r, 2 == layout.alignment(*context.fTypes.fBool2));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool3));
REPORTER_ASSERT(r, 4 == layout.alignment(*context.fTypes.fBool4));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat2x2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat2x4));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat3x3));
REPORTER_ASSERT(r, 8 == layout.alignment(*context.fTypes.fFloat4x2));
REPORTER_ASSERT(r, 16 == layout.alignment(*context.fTypes.fFloat4x4));
// struct 1
std::vector<SkSL::Type::Field> fields1;
fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"),
context.fTypes.fFloat3.get());
std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s1"),
fields1);
REPORTER_ASSERT(r, 16 == layout.size(*s1));
REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s2"),
fields1);
REPORTER_ASSERT(r, 16 == layout.size(*s2));
REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s3"),
fields1);
REPORTER_ASSERT(r, 32 == layout.size(*s3));
REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
// struct 2
std::vector<SkSL::Type::Field> fields2;
fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s4"),
fields2);
REPORTER_ASSERT(r, 4 == layout.size(*s4));
REPORTER_ASSERT(r, 4 == layout.alignment(*s4));
fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"),
context.fTypes.fFloat3.get());
std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(SkSL::Position(), std::string("s5"),
fields2);
REPORTER_ASSERT(r, 32 == layout.size(*s5));
REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
// arrays
std::unique_ptr<SkSL::Type> array1 =
SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
REPORTER_ASSERT(r, 16 == layout.size(*array1));
REPORTER_ASSERT(r, 4 == layout.alignment(*array1));
REPORTER_ASSERT(r, 4 == layout.stride(*array1));
std::unique_ptr<SkSL::Type> array2 =
SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
REPORTER_ASSERT(r, 64 == layout.size(*array2));
REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
REPORTER_ASSERT(r, 16 == layout.stride(*array2));
}
Reference in New Issue View Git Blame Copy Permalink