mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-29 22:41:03 +00:00
7d1b176c1d
Fix #2475. Fix #2476. * Improve reducer algorithm: shrink granularity, remove an early return, no lazy initialization, notify pass if binary is interesting, add comments. * Add fail-on-validation-error option to fail a reduction if an invalid state is reached; useful for tests. * Set fail-on-validation-error in tests. * Improve some documentation comments. * Add Reducer::AddDefaultReductionPasses so tests (and other library consumers) can add the default reduction passes. * Add CLIMessageConsumer in test_reduce so we can see messages for tricky tests. * Remove test RemoveUnreferencedInstructionReductionPassTest_ApplyReduction because it was indirectly testing the reduction algorithm, not the RemoveUnreferencedInstruction pass. * Tweak tests where needed.
97 lines
3.2 KiB
C++
97 lines
3.2 KiB
C++
// Copyright (c) 2018 Google LLC
|
|
//
|
|
// 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 "reduce_test_util.h"
|
|
|
|
#include <iostream>
|
|
|
|
namespace spvtools {
|
|
namespace reduce {
|
|
|
|
void CheckEqual(const spv_target_env env,
|
|
const std::vector<uint32_t>& expected_binary,
|
|
const std::vector<uint32_t>& actual_binary) {
|
|
if (expected_binary != actual_binary) {
|
|
SpirvTools t(env);
|
|
std::string expected_disassembled;
|
|
std::string actual_disassembled;
|
|
ASSERT_TRUE(t.Disassemble(expected_binary, &expected_disassembled,
|
|
kReduceDisassembleOption));
|
|
ASSERT_TRUE(t.Disassemble(actual_binary, &actual_disassembled,
|
|
kReduceDisassembleOption));
|
|
ASSERT_EQ(expected_disassembled, actual_disassembled);
|
|
}
|
|
}
|
|
|
|
void CheckEqual(const spv_target_env env, const std::string& expected_text,
|
|
const std::vector<uint32_t>& actual_binary) {
|
|
std::vector<uint32_t> expected_binary;
|
|
SpirvTools t(env);
|
|
ASSERT_TRUE(
|
|
t.Assemble(expected_text, &expected_binary, kReduceAssembleOption));
|
|
CheckEqual(env, expected_binary, actual_binary);
|
|
}
|
|
|
|
void CheckEqual(const spv_target_env env, const std::string& expected_text,
|
|
const opt::IRContext* actual_ir) {
|
|
std::vector<uint32_t> actual_binary;
|
|
actual_ir->module()->ToBinary(&actual_binary, false);
|
|
CheckEqual(env, expected_text, actual_binary);
|
|
}
|
|
|
|
void CheckValid(spv_target_env env, const opt::IRContext* ir) {
|
|
std::vector<uint32_t> binary;
|
|
ir->module()->ToBinary(&binary, false);
|
|
SpirvTools t(env);
|
|
ASSERT_TRUE(t.Validate(binary));
|
|
}
|
|
|
|
std::string ToString(spv_target_env env, const opt::IRContext* ir) {
|
|
std::vector<uint32_t> binary;
|
|
ir->module()->ToBinary(&binary, false);
|
|
SpirvTools t(env);
|
|
std::string result;
|
|
t.Disassemble(binary, &result, kReduceDisassembleOption);
|
|
return result;
|
|
}
|
|
|
|
void NopDiagnostic(spv_message_level_t /*level*/, const char* /*source*/,
|
|
const spv_position_t& /*position*/,
|
|
const char* /*message*/) {}
|
|
|
|
void CLIMessageConsumer(spv_message_level_t level, const char*,
|
|
const spv_position_t& position, const char* message) {
|
|
switch (level) {
|
|
case SPV_MSG_FATAL:
|
|
case SPV_MSG_INTERNAL_ERROR:
|
|
case SPV_MSG_ERROR:
|
|
std::cerr << "error: line " << position.index << ": " << message
|
|
<< std::endl;
|
|
break;
|
|
case SPV_MSG_WARNING:
|
|
std::cout << "warning: line " << position.index << ": " << message
|
|
<< std::endl;
|
|
break;
|
|
case SPV_MSG_INFO:
|
|
std::cout << "info: line " << position.index << ": " << message
|
|
<< std::endl;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
} // namespace reduce
|
|
} // namespace spvtools
|