mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-22 06:23:33 +00:00
ArrayLengthFromUniform is needed for correct bounds checks on dynamic storage buffers on D3D12. The intrinsic GetDimensions does not return the actual size of the buffer binding. ArrayLengthFromUniform is updated to output the indices of the uniform buffer that are statically used. This allows Dawn to minimize the amount of data needed to upload into the uniform buffer. These output indices are returned on the HLSL/MSL generator result. ArrayLengthFromUniform is also updated to allow only some of the arrayLength calls to be replaced with uniform buffer loads. For HLSL output, the remaining arrayLength computations will continue to use GetDimensions(). For MSL, it is invalid to not specify an index into the uniform buffer for all storage buffers. After Dawn is updated to use the array_length_from_uniform option in the Metal backend, the buffer_size_ubo_index member for MSL output may be removed. Bug: dawn:429 Change-Id: I9da4ec4a20882e9f1bfa5bb026725d72529eff26 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/69301 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: James Price <jrprice@google.com> Commit-Queue: Austin Eng <enga@chromium.org>
121 lines
3.9 KiB
C++
121 lines
3.9 KiB
C++
// Copyright 2020 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.
|
|
|
|
#ifndef SRC_WRITER_HLSL_TEST_HELPER_H_
|
|
#define SRC_WRITER_HLSL_TEST_HELPER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "gtest/gtest.h"
|
|
#include "src/transform/manager.h"
|
|
#include "src/transform/renamer.h"
|
|
#include "src/writer/hlsl/generator.h"
|
|
#include "src/writer/hlsl/generator_impl.h"
|
|
|
|
namespace tint {
|
|
namespace writer {
|
|
namespace hlsl {
|
|
|
|
/// Helper class for testing
|
|
template <typename BODY>
|
|
class TestHelperBase : public BODY, public ProgramBuilder {
|
|
public:
|
|
TestHelperBase() = default;
|
|
~TestHelperBase() override = default;
|
|
|
|
/// Builds the program and returns a GeneratorImpl from the program.
|
|
/// @note The generator is only built once. Multiple calls to Build() will
|
|
/// return the same GeneratorImpl without rebuilding.
|
|
/// @return the built generator
|
|
GeneratorImpl& Build() {
|
|
if (gen_) {
|
|
return *gen_;
|
|
}
|
|
[&]() {
|
|
ASSERT_TRUE(IsValid()) << "Builder program is not valid\n"
|
|
<< diag::Formatter().format(Diagnostics());
|
|
}();
|
|
program = std::make_unique<Program>(std::move(*this));
|
|
[&]() {
|
|
ASSERT_TRUE(program->IsValid())
|
|
<< diag::Formatter().format(program->Diagnostics());
|
|
}();
|
|
gen_ = std::make_unique<GeneratorImpl>(program.get());
|
|
return *gen_;
|
|
}
|
|
|
|
/// Builds the program, runs the program through the HLSL sanitizer
|
|
/// and returns a GeneratorImpl from the sanitized program.
|
|
/// @param options The HLSL generator options.
|
|
/// @note The generator is only built once. Multiple calls to Build() will
|
|
/// return the same GeneratorImpl without rebuilding.
|
|
/// @return the built generator
|
|
GeneratorImpl& SanitizeAndBuild(const Options& options = {}) {
|
|
if (gen_) {
|
|
return *gen_;
|
|
}
|
|
diag::Formatter formatter;
|
|
[&]() {
|
|
ASSERT_TRUE(IsValid()) << "Builder program is not valid\n"
|
|
<< formatter.format(Diagnostics());
|
|
}();
|
|
program = std::make_unique<Program>(std::move(*this));
|
|
[&]() {
|
|
ASSERT_TRUE(program->IsValid())
|
|
<< formatter.format(program->Diagnostics());
|
|
}();
|
|
|
|
auto sanitized_result = Sanitize(
|
|
program.get(), options.root_constant_binding_point,
|
|
options.disable_workgroup_init, options.array_length_from_uniform);
|
|
[&]() {
|
|
ASSERT_TRUE(sanitized_result.program.IsValid())
|
|
<< formatter.format(sanitized_result.program.Diagnostics());
|
|
}();
|
|
|
|
transform::Manager transform_manager;
|
|
transform::DataMap transform_data;
|
|
transform_data.Add<transform::Renamer::Config>(
|
|
transform::Renamer::Target::kHlslKeywords);
|
|
transform_manager.Add<tint::transform::Renamer>();
|
|
auto result =
|
|
transform_manager.Run(&sanitized_result.program, transform_data);
|
|
[&]() {
|
|
ASSERT_TRUE(result.program.IsValid())
|
|
<< formatter.format(result.program.Diagnostics());
|
|
}();
|
|
*program = std::move(result.program);
|
|
gen_ = std::make_unique<GeneratorImpl>(program.get());
|
|
return *gen_;
|
|
}
|
|
|
|
/// The program built with a call to Build()
|
|
std::unique_ptr<Program> program;
|
|
|
|
private:
|
|
std::unique_ptr<GeneratorImpl> gen_;
|
|
};
|
|
using TestHelper = TestHelperBase<testing::Test>;
|
|
|
|
template <typename T>
|
|
using TestParamHelper = TestHelperBase<testing::TestWithParam<T>>;
|
|
|
|
} // namespace hlsl
|
|
} // namespace writer
|
|
} // namespace tint
|
|
|
|
#endif // SRC_WRITER_HLSL_TEST_HELPER_H_
|