010693b795
* Migrate XML counter defs and reader from v1/v2 * Current Working Set * Modified parser * Evaluate AST Start * Update lib/common/xml - move definitions out of class declaration * Update lib/rocprofiler/counters/parser - update build of bison and flex build - reproducible generation - add ROCPROFILER_REGENERATE_COUNTERS_PARSER option - fix namespacing * Update lib/rocprofiler/counters/xml - change location of XML files and install them * Update lib/rocprofiler/counter/tests - normalize the test names - improve test failures (more clear about where failure is) * Update lib/rocprofiler/counters - fix namespace - update to new XML metrics directory * Update lib/rocprofiler/CMakeLists.txt - link to object library * Update lib/rocprofiler/hsa/types.hpp - reorganize includes * Add metric loading class/printers * Agent Implementation * Queue Implementation (#79) * Queue Implementation * API Implementation For Counters (part 1) (#80) * API Implementation For Counters * Bewelton/counter collection 3 (#84) * Added counter sample * More changes * More changes * Update samples/counter_collection - mostly formatting * Update include/rocprofiler/counters.h - formatting * Add lib.common/synchronized.hpp - Synchronized struct * Update lib/rocprofiler/counters/xml/basic_counters.xml - whitespace * Update scripts/patch-parser.cmake - tweaks for consistency * Update lib/rocprofiler/counters/parser/tests/parser_tests.cpp - formatting * Update lib/rocprofiler/counters/parser - improve consistency in rocprofiler-expr-parser-patch - update parser.{h,cpp} and scanner.cpp - formatting + regenerated * Update lib/rocprofiler/aql - formatting - clang-tidy fixes - guard against memory pool access errors * Update lib/rocprofiler/aql/tests - formatting - update use of get_val - normalize test names * Update lib/rocprofiler/counters/tests - formatting - patch basic_counters and derived_counters - normalize test names * Update lib/rocprofiler/aql/tests - set_tests_properties * Update test labels - fix minor issue with gtest labels * Update lib/rocprofiler/counters - formatting - clang-tidy fixes * Update lib/rocprofiler/hsa - fix includes - formatting - clang-tidy fixes - tweak to queue_controller_init interface * Update lib/rocprofiler - include fixes - namespace fixes - clang-tidy fixes - formatting * Update scripts/run-ci.py - exclude counters/parser from code coverage (generated files) * Update include/rocprofiler/counters.h - fix doxygen comment * Update lib/rocprofiler/aql/packet_construct.cpp - guard against HSA_AMD_MEMORY_POOL_ACCESS_DISALLOWED_BY_DEFAULT and HSA_AMD_MEMORY_POOL_ACCESS_NEVER_ALLOWED * Update lib/rocprofiler/counters/parser/raw_ast.hpp - clang-tidy fixes * Update lib/rocprofiler/counters/evaluate_ast.hpp - clang-tidy fixes * Update lib/rocprofiler/aql/tests - disable packet_generation_single and packet_generation_multi tests - the entire implementation rocprofiler::get_ext_table() is incorrect * Minor fixes before cleanup * More changes * More fixes * More fixes * source formatting (clang-format v11) (#99) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Revert PTL submodule * Update scripts/run-ci.py - exclude counters/parser from code coverage (generated files) * Migrating counters state to context * Linting * source formatting (clang-format v11) (#101) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * revert run-ci * Testing fixes * More test changes * Fix minor typo * Small queue change * Small queue change * source formatting (clang-format v11) (#102) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * source formatting (clang-format v11) (#105) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Documentation Change * More documentation fixes * source formatting (clang-format v11) (#106) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Threading fixes * Threading fixes * source formatting (clang-format v11) (#107) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Threading fixes * More test fixes * More agent fixes * More build fixes * source formatting (clang-format v11) (#109) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * changed test timeouts * Build fix * Build fix * Updates to agent * source formatting (clang-format v11) (#114) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * cmake formatting (cmake-format) (#113) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * remove git worktree folder * Doc update * testing fix * Another test fix * More test changes * Rebase * source formatting (clang-format v11) (#116) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Documentation * source formatting (clang-format v11) (#119) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * PTL Changes * Minor agent fix for empty labels * source formatting (clang-format v11) (#120) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Minor agent fix for empty labels * Refactor read_map * source formatting (clang-format v11) (#121) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Refactor read_map * Cache fixes * source formatting (clang-format v11) (#122) Co-authored-by: bwelton <bwelton@users.noreply.github.com> --------- Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: bwelton <bwelton@users.noreply.github.com>
190 lines
5.4 KiB
C++
190 lines
5.4 KiB
C++
#pragma once
|
|
|
|
#include <map>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <variant>
|
|
#include <vector>
|
|
|
|
#include <fmt/core.h>
|
|
#include <fmt/ranges.h>
|
|
#include <glog/logging.h>
|
|
|
|
namespace rocprofiler
|
|
{
|
|
namespace counters
|
|
{
|
|
enum NodeType
|
|
{
|
|
NONE = 0,
|
|
ADDITION_NODE,
|
|
DIVIDE_NODE,
|
|
MULTIPLY_NODE,
|
|
NUMBER_NODE,
|
|
RANGE_NODE,
|
|
REDUCE_NODE,
|
|
REFERENCE_NODE,
|
|
REFERENCE_SET,
|
|
SELECT_NODE,
|
|
SUBTRACTION_NODE,
|
|
};
|
|
|
|
struct RawAST
|
|
{
|
|
// Node type
|
|
NodeType type{NONE}; // Operation to perform on the counter set
|
|
NodeType operation{NONE};
|
|
|
|
// Stores either the name or digit dependening on whether this
|
|
// is a name or number
|
|
std::variant<std::monostate, std::string, int64_t> value{std::monostate{}};
|
|
|
|
// Counter set of ASTs needed to compute this counter.
|
|
// Operation is applied to all counters in this set.
|
|
std::vector<RawAST*> counter_set;
|
|
|
|
// Reference set to remove dimensions (such as shader)
|
|
// from the result. This is a future looking change and
|
|
// will be unsupported in 6.0.
|
|
std::vector<RawAST*> reference_set;
|
|
|
|
// Range restriction on this node
|
|
RawAST* range{nullptr};
|
|
|
|
~RawAST()
|
|
{
|
|
auto deleteVec = [](auto& vec) {
|
|
for(auto val : vec)
|
|
{
|
|
delete val;
|
|
}
|
|
};
|
|
|
|
deleteVec(reference_set);
|
|
deleteVec(counter_set);
|
|
delete range;
|
|
}
|
|
|
|
// Constructors for raw value types
|
|
RawAST(NodeType t, const char* v)
|
|
: type(t)
|
|
, value(std::string{CHECK_NOTNULL(v)})
|
|
{}
|
|
|
|
RawAST(NodeType t, int64_t v)
|
|
: type(t)
|
|
, value(v)
|
|
{}
|
|
|
|
// Reduce/Select operation constructor. Counter is the counter AST
|
|
// to use for the reduce/select op, op is how to reduce (i.e. SUM,AVG,etc),
|
|
// refs is the reference set AST. This reference set is copied to flatten
|
|
// the AST.
|
|
RawAST(NodeType t, RawAST* counter, const char* op, RawAST* refs = nullptr)
|
|
: type(t)
|
|
, value(std::string{CHECK_NOTNULL(op)})
|
|
, counter_set({counter})
|
|
{
|
|
copy_reference_set(refs);
|
|
}
|
|
|
|
RawAST(NodeType t, std::vector<RawAST*> c)
|
|
: type(t)
|
|
, counter_set(std::move(c))
|
|
{}
|
|
|
|
// Following two calls are for future reference set settings
|
|
// for select/reduce ops.
|
|
|
|
// Referene set constructor, refs is a pointer to an existing
|
|
// reference set when multiple references are given (i.e.
|
|
// shader=X,anotherRef=Y,....).
|
|
RawAST(NodeType t, const char* v, RawAST* r, RawAST* refs = nullptr)
|
|
: type(t)
|
|
, value(std::string{CHECK_NOTNULL(v)})
|
|
, range(r)
|
|
{
|
|
LOG(ERROR) << "BUilding bad ast";
|
|
copy_reference_set(refs);
|
|
}
|
|
|
|
// Flattens reference set tree into this node.
|
|
void copy_reference_set(RawAST* ast)
|
|
{
|
|
if(!ast) return;
|
|
reference_set.push_back(ast);
|
|
reference_set.insert(
|
|
reference_set.end(), ast->reference_set.begin(), ast->reference_set.end());
|
|
ast->reference_set.clear();
|
|
}
|
|
};
|
|
} // namespace counters
|
|
} // namespace rocprofiler
|
|
|
|
namespace fmt
|
|
{
|
|
// fmt::format support for RawAST
|
|
template <>
|
|
struct formatter<rocprofiler::counters::RawAST>
|
|
{
|
|
template <typename ParseContext>
|
|
constexpr auto parse(ParseContext& ctx)
|
|
{
|
|
return ctx.begin();
|
|
}
|
|
|
|
template <typename Ctx>
|
|
auto format(rocprofiler::counters::RawAST const& ast, Ctx& ctx) const
|
|
{
|
|
static const std::map<rocprofiler::counters::NodeType, std::string> NodeTypeToString = {
|
|
{rocprofiler::counters::NONE, "NONE"},
|
|
{rocprofiler::counters::ADDITION_NODE, "ADDITION_NODE"},
|
|
{rocprofiler::counters::DIVIDE_NODE, "DIVIDE_NODE"},
|
|
{rocprofiler::counters::MULTIPLY_NODE, "MULTIPLY_NODE"},
|
|
{rocprofiler::counters::NUMBER_NODE, "NUMBER_NODE"},
|
|
{rocprofiler::counters::RANGE_NODE, "RANGE_NODE"},
|
|
{rocprofiler::counters::REDUCE_NODE, "REDUCE_NODE"},
|
|
{rocprofiler::counters::REFERENCE_NODE, "REFERENCE_NODE"},
|
|
{rocprofiler::counters::REFERENCE_SET, "REFERENCE_SET"},
|
|
{rocprofiler::counters::SELECT_NODE, "SELECT_NODE"},
|
|
{rocprofiler::counters::SUBTRACTION_NODE, "SUBTRACTION_NODE"},
|
|
};
|
|
|
|
auto out = fmt::format_to(ctx.out(),
|
|
"{{\"Type\":\"{}\", \"Operation\":\"{}\",",
|
|
NodeTypeToString.at(ast.type),
|
|
NodeTypeToString.at(ast.operation));
|
|
|
|
if(const auto* string_val = std::get_if<std::string>(&ast.value))
|
|
{
|
|
out = fmt::format_to(out, " \"Value\":\"{}\",", *string_val);
|
|
}
|
|
else if(const auto* int_val = std::get_if<int64_t>(&ast.value))
|
|
{
|
|
out = fmt::format_to(out, " \"Value\":{},", *int_val);
|
|
}
|
|
|
|
if(ast.range)
|
|
{
|
|
out = fmt::format_to(out, " \"Range\":{},", *ast.range);
|
|
}
|
|
|
|
out = fmt::format_to(out, "\"ReferenceSet\":[");
|
|
for(const auto& ref : ast.reference_set)
|
|
{
|
|
out = fmt::format_to(
|
|
out, "{}{}", *CHECK_NOTNULL(ref), ref == ast.reference_set.back() ? "" : ",");
|
|
}
|
|
|
|
out = fmt::format_to(out, "], \"CounterSet\":[");
|
|
for(const auto& ref : ast.counter_set)
|
|
{
|
|
out = fmt::format_to(
|
|
out, "{}{}", *CHECK_NOTNULL(ref), ref == ast.counter_set.back() ? "" : ",");
|
|
}
|
|
return fmt::format_to(out, "]}}");
|
|
}
|
|
};
|
|
} // namespace fmt
|