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

Move spirv_stats into tools/stats. (#1826)

Browse Source 
The spirv_stats code is only used by the tools/stats module. This CL
moves the code to that module.
This commit is contained in:
dan sinclair 2018-08-13 11:48:25 -04:00 committed by GitHub
parent 6cd4441c87
commit da0f1dcccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/CMakeLists.txt
View File

@ -275,7 +275,6 @@ set(SPIRV_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
${CMAKE_CURRENT_SOURCE_DIR}/software_version.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spirv_endian.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spirv_stats.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spirv_target_env.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spirv_validator_options.cpp
${CMAKE_CURRENT_SOURCE_DIR}/table.cpp

1
test/stats/CMakeLists.txt
View File

@ -19,6 +19,7 @@ set(VAL_TEST_COMMON_SRCS
add_spvtools_unittest(TARGET stats_aggregate
SRCS stats_aggregate_test.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/stats/spirv_stats.cpp
${VAL_TEST_COMMON_SRCS}
LIBS ${SPIRV_TOOLS}
)

4
test/stats/stats_aggregate_test.cpp
View File

@ -17,11 +17,12 @@
#include <string>
#include <unordered_map>
#include "source/spirv_stats.h"
#include "test/test_fixture.h"
#include "test/unit_spirv.h"
#include "tools/stats/spirv_stats.h"
namespace spvtools {
namespace stats {
namespace {
using spvtest::ScopedContext;
@ -482,4 +483,5 @@ OpMemoryModel Logical GLSL450
}
} // namespace
} // namespace stats
} // namespace spvtools

2
test/stats/stats_analyzer_test.cpp
View File

@ -22,6 +22,7 @@
#include "tools/stats/stats_analyzer.h"
namespace spvtools {
namespace stats {
namespace {
// Fills |stats| with some synthetic header stats, as if aggregated from 100
@ -169,4 +170,5 @@ TEST(StatsAnalyzer, OpcodeMarkov) {
}
} // namespace
} // namespace stats
} // namespace spvtools

5
tools/CMakeLists.txt
View File

@ -45,7 +45,10 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
add_spvtools_tool(TARGET spirv-link SRCS link/linker.cpp LIBS SPIRV-Tools-link ${SPIRV_TOOLS})
add_spvtools_tool(TARGET spirv-stats
SRCS stats/stats.cpp
stats/stats_analyzer.cpp
stats/stats_analyzer.cpp
stats/stats_analyzer.h
stats/spirv_stats.cpp
stats/spirv_stats.h
LIBS ${SPIRV_TOOLS})
add_spvtools_tool(TARGET spirv-cfg
SRCS cfg/cfg.cpp

4
source/spirv_stats.cpp → tools/stats/spirv_stats.cpp
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "source/spirv_stats.h"
#include "tools/stats/spirv_stats.h"
#include <cassert>
@ -33,6 +33,7 @@
#include "spirv-tools/libspirv.h"
namespace spvtools {
namespace stats {
namespace {
// Helper class for stats aggregation. Receives as in/out parameter.
@ -259,4 +260,5 @@ spv_result_t AggregateStats(const spv_context_t& context, const uint32_t* words,
return SPV_SUCCESS;
}
} // namespace stats
} // namespace spvtools

8
source/spirv_stats.h → tools/stats/spirv_stats.h
View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SOURCE_SPIRV_STATS_H_
#define SOURCE_SPIRV_STATS_H_
#ifndef TOOLS_STATS_SPIRV_STATS_H_
#define TOOLS_STATS_SPIRV_STATS_H_
#include <map>
#include <string>
@ -24,6 +24,7 @@
#include "spirv-tools/libspirv.hpp"
namespace spvtools {
namespace stats {
struct SpirvStats {
// Version histogram, version_word -> count.
@ -126,6 +127,7 @@ spv_result_t AggregateStats(const spv_context_t& context, const uint32_t* words,
const size_t num_words, spv_diagnostic* pDiagnostic,
SpirvStats* stats);
} // namespace stats
} // namespace spvtools
#endif // SOURCE_SPIRV_STATS_H_
#endif // TOOLS_STATS_SPIRV_STATS_H_

44
tools/stats/stats.cpp
View File

@ -19,14 +19,12 @@
#include <unordered_map>
#include <vector>
#include "source/spirv_stats.h"
#include "source/table.h"
#include "spirv-tools/libspirv.h"
#include "tools/io.h"
#include "tools/stats/spirv_stats.h"
#include "tools/stats/stats_analyzer.h"
using spvtools::SpirvStats;
namespace {
struct ScopedContext {
@ -83,7 +81,6 @@ int main(int argc, char** argv) {
bool expect_output_path = false;
bool verbose = false;
bool export_text = true;
std::vector<const char*> paths;
const char* output_path = nullptr;
@ -126,7 +123,7 @@ int main(int argc, char** argv) {
ScopedContext ctx(SPV_ENV_UNIVERSAL_1_1);
spvtools::SetContextMessageConsumer(ctx.context, DiagnosticsMessageHandler);
spvtools::SpirvStats stats;
spvtools::stats::SpirvStats stats;
stats.opcode_markov_hist.resize(1);
for (size_t index = 0; index < paths.size(); ++index) {
@ -140,15 +137,15 @@ int main(int argc, char** argv) {
std::vector<uint32_t> contents;
if (!ReadFile<uint32_t>(path, "rb", &contents)) return 1;
if (SPV_SUCCESS != spvtools::AggregateStats(*ctx.context, contents.data(),
contents.size(), nullptr,
&stats)) {
if (SPV_SUCCESS !=
spvtools::stats::AggregateStats(*ctx.context, contents.data(),
contents.size(), nullptr, &stats)) {
std::cerr << "error: Failed to aggregate stats for " << path << std::endl;
return 1;
}
}
StatsAnalyzer analyzer(stats);
spvtools::stats::StatsAnalyzer analyzer(stats);
std::ofstream fout;
if (output_path) {
@ -160,27 +157,24 @@ int main(int argc, char** argv) {
}
std::ostream& out = fout.is_open() ? fout : std::cout;
out << std::endl;
analyzer.WriteVersion(out);
analyzer.WriteGenerator(out);
if (export_text) {
out << std::endl;
analyzer.WriteVersion(out);
analyzer.WriteGenerator(out);
out << std::endl;
analyzer.WriteCapability(out);
out << std::endl;
analyzer.WriteCapability(out);
out << std::endl;
analyzer.WriteExtension(out);
out << std::endl;
analyzer.WriteExtension(out);
out << std::endl;
analyzer.WriteOpcode(out);
out << std::endl;
analyzer.WriteOpcode(out);
out << std::endl;
analyzer.WriteOpcodeMarkov(out);
out << std::endl;
analyzer.WriteOpcodeMarkov(out);
out << std::endl;
analyzer.WriteConstantLiterals(out);
}
out << std::endl;
analyzer.WriteConstantLiterals(out);
return 0;
}

11
tools/stats/stats_analyzer.cpp
View File

@ -33,14 +33,14 @@
#include "source/operand.h"
#include "source/spirv_constant.h"
namespace spvtools {
namespace stats {
namespace {
using spvtools::SpirvStats;
// Signals that the value is not in the coding scheme and a fallback method
// needs to be used.
const uint64_t kMarkvNoneOfTheAbove =
spvtools::comp::MarkvModel::GetMarkvNoneOfTheAbove();
comp::MarkvModel::GetMarkvNoneOfTheAbove();
std::string GetVersionString(uint32_t word) {
std::stringstream ss;
@ -58,7 +58,7 @@ std::string GetOpcodeString(uint32_t word) {
}
std::string GetCapabilityString(uint32_t word) {
return spvtools::CapabilityToString(static_cast<SpvCapability>(word));
return CapabilityToString(static_cast<SpvCapability>(word));
}
template <class T>
@ -230,3 +230,6 @@ void StatsAnalyzer::WriteOpcodeMarkov(std::ostream& out) {
}
}
}
} // namespace stats
} // namespace spvtools

12
tools/stats/stats_analyzer.h
View File

@ -18,11 +18,14 @@
#include <string>
#include <unordered_map>
#include "source/spirv_stats.h"
#include "tools/stats/spirv_stats.h"
namespace spvtools {
namespace stats {
class StatsAnalyzer {
public:
explicit StatsAnalyzer(const spvtools::SpirvStats& stats);
explicit StatsAnalyzer(const SpirvStats& stats);
// Writes respective histograms to |out|.
void WriteVersion(std::ostream& out);
@ -38,7 +41,7 @@ class StatsAnalyzer {
void WriteOpcodeMarkov(std::ostream& out);
private:
const spvtools::SpirvStats& stats_;
const SpirvStats& stats_;
uint32_t num_modules_;
@ -49,4 +52,7 @@ class StatsAnalyzer {
std::unordered_map<uint32_t, double> opcode_freq_;
};
} // namespace stats
} // namespace spvtools
#endif // TOOLS_STATS_STATS_ANALYZER_H_