AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-12-26 01:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove stats use of internal API (#1924)

Browse Source 
Instead of using the source/table.h methods, this CL switches the stats
tool to use the spvtools::Context class and assign the message consumer
through the public API.
This commit is contained in:
dan sinclair 2018-09-26 10:32:05 -07:00 committed by GitHub
parent 0e5fc7d75e
commit 7249506b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/stats/stats_aggregate_test.cpp
View File

@ -51,13 +51,13 @@ void DiagnosticsMessageHandler(spv_message_level_t level, const char*,
// Calls AggregateStats for binary compiled from |code|.
void CompileAndAggregateStats(const std::string& code, SpirvStats* stats,
spv_target_env env = SPV_ENV_UNIVERSAL_1_1) {
ScopedContext ctx(env);
SetContextMessageConsumer(ctx.context, DiagnosticsMessageHandler);
spvtools::Context ctx(env);
ctx.SetMessageConsumer(DiagnosticsMessageHandler);
spv_binary binary;
ASSERT_EQ(SPV_SUCCESS, spvTextToBinary(ctx.context, code.c_str(), code.size(),
&binary, nullptr));
ASSERT_EQ(SPV_SUCCESS, spvTextToBinary(ctx.CContext(), code.c_str(),
code.size(), &binary, nullptr));
ASSERT_EQ(SPV_SUCCESS, AggregateStats(*ctx.context, binary->code,
ASSERT_EQ(SPV_SUCCESS, AggregateStats(ctx.CContext(), binary->code,
binary->wordCount, nullptr, stats));
spvBinaryDestroy(binary);
}

4
tools/stats/spirv_stats.cpp
View File

@ -147,13 +147,13 @@ class StatsAggregator {
} // namespace
spv_result_t AggregateStats(const spv_context_t& context, const uint32_t* words,
spv_result_t AggregateStats(const spv_context context, const uint32_t* words,
const size_t num_words, spv_diagnostic* pDiagnostic,
SpirvStats* stats) {
std::unique_ptr<val::ValidationState_t> vstate;
spv_validator_options_t options;
spv_result_t result = ValidateBinaryAndKeepValidationState(
&context, &options, words, num_words, pDiagnostic, &vstate);
context, &options, words, num_words, pDiagnostic, &vstate);
if (result != SPV_SUCCESS) return result;
StatsAggregator stats_aggregator(stats, vstate.get());

2
tools/stats/spirv_stats.h
View File

@ -83,7 +83,7 @@ struct SpirvStats {
};
// Aggregates existing |stats| with new stats extracted from |binary|.
spv_result_t AggregateStats(const spv_context_t& context, const uint32_t* words,
spv_result_t AggregateStats(const spv_context context, const uint32_t* words,
const size_t num_words, spv_diagnostic* pDiagnostic,
SpirvStats* stats);

13
tools/stats/stats.cpp
View File

@ -19,7 +19,6 @@
#include <unordered_map>
#include <vector>
#include "source/table.h"
#include "spirv-tools/libspirv.h"
#include "tools/io.h"
#include "tools/stats/spirv_stats.h"
@ -27,12 +26,6 @@
namespace {
struct ScopedContext {
ScopedContext(spv_target_env env) : context(spvContextCreate(env)) {}
~ScopedContext() { spvContextDestroy(context); }
spv_context context;
};
void PrintUsage(char* argv0) {
printf(
R"(%s - Collect statistics from one or more SPIR-V binary file(s).
@ -120,8 +113,8 @@ int main(int argc, char** argv) {
std::cerr << "Processing " << paths.size() << " files..." << std::endl;
ScopedContext ctx(SPV_ENV_UNIVERSAL_1_1);
spvtools::SetContextMessageConsumer(ctx.context, DiagnosticsMessageHandler);
spvtools::Context ctx(SPV_ENV_UNIVERSAL_1_1);
ctx.SetMessageConsumer(DiagnosticsMessageHandler);
spvtools::stats::SpirvStats stats;
stats.opcode_markov_hist.resize(1);
@ -138,7 +131,7 @@ int main(int argc, char** argv) {
if (!ReadFile<uint32_t>(path, "rb", &contents)) return 1;
if (SPV_SUCCESS !=
spvtools::stats::AggregateStats(*ctx.context, contents.data(),
spvtools::stats::AggregateStats(ctx.CContext(), contents.data(),
contents.size(), nullptr, &stats)) {
std::cerr << "error: Failed to aggregate stats for " << path << std::endl;
return 1;