From c1aa1059c6872b93efd9b6c19f27945037c74b75 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 31 Aug 2021 11:55:25 +0300 Subject: [PATCH] intel/perf: support new operators for upcoming metrics Signed-off-by: Lionel Landwerlin Reviewed-by: Ivan Briano Part-of: --- src/intel/perf/gen_perf.py | 17 +++++++++++++++++ src/intel/perf/intel_perf.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py index 8ec3123..5fc5c0e 100644 --- a/src/intel/perf/gen_perf.py +++ b/src/intel/perf/gen_perf.py @@ -186,9 +186,15 @@ def brkt(subexp): def splice_bitwise_and(args): return brkt(args[1]) + " & " + brkt(args[0]) +def splice_bitwise_or(args): + return brkt(args[1]) + " | " + brkt(args[0]) + def splice_logical_and(args): return brkt(args[1]) + " && " + brkt(args[0]) +def splice_umul(args): + return brkt(args[1]) + " * " + brkt(args[0]) + def splice_ult(args): return brkt(args[1]) + " < " + brkt(args[0]) @@ -201,12 +207,22 @@ def splice_ulte(args): def splice_ugt(args): return brkt(args[1]) + " > " + brkt(args[0]) +def splice_lshft(args): + return brkt(args[1]) + " << " + brkt(args[0]) + +def splice_equal(args): + return brkt(args[1]) + " == " + brkt(args[0]) + exp_ops = {} # (n operands, splicer) exp_ops["AND"] = (2, splice_bitwise_and) +exp_ops["OR"] = (2, splice_bitwise_or) exp_ops["UGTE"] = (2, splice_ugte) exp_ops["ULT"] = (2, splice_ult) exp_ops["&&"] = (2, splice_logical_and) +exp_ops["UMUL"] = (2, splice_umul) +exp_ops["<<"] = (2, splice_lshft) +exp_ops["=="] = (2, splice_equal) hw_vars = {} @@ -436,6 +452,7 @@ units_map = { "threads" : True, "us" : True, "utilization" : False, + "gbps" : True, } diff --git a/src/intel/perf/intel_perf.h b/src/intel/perf/intel_perf.h index 4855344..207c237 100644 --- a/src/intel/perf/intel_perf.h +++ b/src/intel/perf/intel_perf.h @@ -75,6 +75,7 @@ enum PACKED intel_perf_counter_data_type { enum PACKED intel_perf_counter_units { /* size */ INTEL_PERF_COUNTER_UNITS_BYTES, + INTEL_PERF_COUNTER_UNITS_GBPS, /* frequency */ INTEL_PERF_COUNTER_UNITS_HZ, -- 2.7.4