@@ -40,38 +40,38 @@ static const char *const big_c_string =
4040/* offset=1475 */ "dispatch_blocked.any\000other\000Memory cluster signals to block micro-op dispatch for any reason\000event=9,period=200000,umask=0x20\000\00000\000\000\000\000\000"
4141/* offset=1608 */ "eist_trans\000other\000Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions\000event=0x3a,period=200000\000\00000\000\000\000\000\000"
4242/* offset=1726 */ "hisi_sccl,ddrc\000"
43- /* offset=1741 */ "uncore_hisi_ddrc.flux_wcmd\000uncore\000DDRC write commands\000event=2\000\00000\000\000\000\000DDRC write commands \000"
44- /* offset=1830 */ "uncore_cbox\000"
45- /* offset=1842 */ "unc_cbo_xsnp_response.miss_eviction\000uncore\000A cross-core snoop resulted from L3 Eviction which misses in some processor core\000event=0x22,umask=0x81\000\00000\000\000\000\000A cross-core snoop resulted from L3 Eviction which misses in some processor core \000"
46- /* offset=2076 */ "event-hyphen\000uncore\000UNC_CBO_HYPHEN\000event=0xe0\000\00000\000\000\000\000UNC_CBO_HYPHEN \000"
47- /* offset=2144 */ "event-two-hyph\000uncore\000UNC_CBO_TWO_HYPH\000event=0xc0\000\00000\000\000\000\000UNC_CBO_TWO_HYPH \000"
48- /* offset=2218 */ "hisi_sccl,l3c\000"
49- /* offset=2232 */ "uncore_hisi_l3c.rd_hit_cpipe\000uncore\000Total read hits\000event=7\000\00000\000\000\000\000Total read hits \000"
50- /* offset=2315 */ "uncore_imc_free_running\000"
51- /* offset=2339 */ "uncore_imc_free_running.cache_miss\000uncore\000Total cache misses\000event=0x12\000\00000\000\000\000\000Total cache misses \000"
52- /* offset=2437 */ "uncore_imc\000"
53- /* offset=2448 */ "uncore_imc.cache_hits\000uncore\000Total cache hits\000event=0x34\000\00000\000\000\000\000Total cache hits \000"
54- /* offset=2529 */ "uncore_sys_ddr_pmu\000"
55- /* offset=2548 */ "sys_ddr_pmu.write_cycles\000uncore\000ddr write-cycles event\000event=0x2b\000v8\00000\000\000\000\000\000"
56- /* offset=2624 */ "uncore_sys_ccn_pmu\000"
57- /* offset=2643 */ "sys_ccn_pmu.read_cycles\000uncore\000ccn read-cycles event\000config=0x2c\0000x01\00000\000\000\000\000\000"
58- /* offset=2720 */ "uncore_sys_cmn_pmu\000"
59- /* offset=2739 */ "sys_cmn_pmu.hnf_cache_miss\000uncore\000Counts total cache misses in first lookup result (high priority)\000eventid=1,type=5\000(434|436|43c|43a).*\00000\000\000\000\000\000"
60- /* offset=2882 */ "CPI\000\0001 / IPC\000\000\000\000\000\000\000\00000"
61- /* offset=2904 */ "IPC\000group1\000inst_retired.any / cpu_clk_unhalted.thread\000\000\000\000\000\000\000\00000"
62- /* offset=2967 */ "Frontend_Bound_SMT\000\000idq_uops_not_delivered.core / (4 * (cpu_clk_unhalted.thread / 2 * (1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk)))\000\000\000\000\000\000\000\00000"
63- /* offset=3133 */ "dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000"
64- /* offset=3197 */ "icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000"
65- /* offset=3264 */ "cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000"
66- /* offset=3335 */ "DCache_L2_All_Hits\000\000l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit\000\000\000\000\000\000\000\00000"
67- /* offset=3429 */ "DCache_L2_All_Miss\000\000max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss\000\000\000\000\000\000\000\00000"
68- /* offset=3563 */ "DCache_L2_All\000\000DCache_L2_All_Hits + DCache_L2_All_Miss\000\000\000\000\000\000\000\00000"
69- /* offset=3627 */ "DCache_L2_Hits\000\000d_ratio(DCache_L2_All_Hits, DCache_L2_All)\000\000\000\000\000\000\000\00000"
70- /* offset=3695 */ "DCache_L2_Misses\000\000d_ratio(DCache_L2_All_Miss, DCache_L2_All)\000\000\000\000\000\000\000\00000"
71- /* offset=3765 */ "M1\000\000ipc + M2\000\000\000\000\000\000\000\00000"
72- /* offset=3787 */ "M2\000\000ipc + M1\000\000\000\000\000\000\000\00000"
73- /* offset=3809 */ "M3\000\0001 / M3\000\000\000\000\000\000\000\00000"
74- /* offset=3829 */ "L1D_Cache_Fill_BW\000\00064 * l1d.replacement / 1e9 / duration_time\000\000\000\000\000\000\000\00000"
43+ /* offset=1741 */ "uncore_hisi_ddrc.flux_wcmd\000uncore\000DDRC write commands\000event=2\000\00000\000\000\000\000 \000"
44+ /* offset=1811 */ "uncore_cbox\000"
45+ /* offset=1823 */ "unc_cbo_xsnp_response.miss_eviction\000uncore\000A cross-core snoop resulted from L3 Eviction which misses in some processor core\000event=0x22,umask=0x81\000\00000\000\000\000\000 \000"
46+ /* offset=1977 */ "event-hyphen\000uncore\000UNC_CBO_HYPHEN\000event=0xe0\000\00000\000\000\000\000 \000"
47+ /* offset=2031 */ "event-two-hyph\000uncore\000UNC_CBO_TWO_HYPH\000event=0xc0\000\00000\000\000\000\000 \000"
48+ /* offset=2089 */ "hisi_sccl,l3c\000"
49+ /* offset=2103 */ "uncore_hisi_l3c.rd_hit_cpipe\000uncore\000Total read hits\000event=7\000\00000\000\000\000\000 \000"
50+ /* offset=2171 */ "uncore_imc_free_running\000"
51+ /* offset=2195 */ "uncore_imc_free_running.cache_miss\000uncore\000Total cache misses\000event=0x12\000\00000\000\000\000\000 \000"
52+ /* offset=2275 */ "uncore_imc\000"
53+ /* offset=2286 */ "uncore_imc.cache_hits\000uncore\000Total cache hits\000event=0x34\000\00000\000\000\000\000 \000"
54+ /* offset=2351 */ "uncore_sys_ddr_pmu\000"
55+ /* offset=2370 */ "sys_ddr_pmu.write_cycles\000uncore\000ddr write-cycles event\000event=0x2b\000v8\00000\000\000\000\000\000"
56+ /* offset=2446 */ "uncore_sys_ccn_pmu\000"
57+ /* offset=2465 */ "sys_ccn_pmu.read_cycles\000uncore\000ccn read-cycles event\000config=0x2c\0000x01\00000\000\000\000\000\000"
58+ /* offset=2542 */ "uncore_sys_cmn_pmu\000"
59+ /* offset=2561 */ "sys_cmn_pmu.hnf_cache_miss\000uncore\000Counts total cache misses in first lookup result (high priority)\000eventid=1,type=5\000(434|436|43c|43a).*\00000\000\000\000\000\000"
60+ /* offset=2704 */ "CPI\000\0001 / IPC\000\000\000\000\000\000\000\00000"
61+ /* offset=2726 */ "IPC\000group1\000inst_retired.any / cpu_clk_unhalted.thread\000\000\000\000\000\000\000\00000"
62+ /* offset=2789 */ "Frontend_Bound_SMT\000\000idq_uops_not_delivered.core / (4 * (cpu_clk_unhalted.thread / 2 * (1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk)))\000\000\000\000\000\000\000\00000"
63+ /* offset=2955 */ "dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000"
64+ /* offset=3019 */ "icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000"
65+ /* offset=3086 */ "cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000"
66+ /* offset=3157 */ "DCache_L2_All_Hits\000\000l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit\000\000\000\000\000\000\000\00000"
67+ /* offset=3251 */ "DCache_L2_All_Miss\000\000max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss\000\000\000\000\000\000\000\00000"
68+ /* offset=3385 */ "DCache_L2_All\000\000DCache_L2_All_Hits + DCache_L2_All_Miss\000\000\000\000\000\000\000\00000"
69+ /* offset=3449 */ "DCache_L2_Hits\000\000d_ratio(DCache_L2_All_Hits, DCache_L2_All)\000\000\000\000\000\000\000\00000"
70+ /* offset=3517 */ "DCache_L2_Misses\000\000d_ratio(DCache_L2_All_Miss, DCache_L2_All)\000\000\000\000\000\000\000\00000"
71+ /* offset=3587 */ "M1\000\000ipc + M2\000\000\000\000\000\000\000\00000"
72+ /* offset=3609 */ "M2\000\000ipc + M1\000\000\000\000\000\000\000\00000"
73+ /* offset=3631 */ "M3\000\0001 / M3\000\000\000\000\000\000\000\00000"
74+ /* offset=3651 */ "L1D_Cache_Fill_BW\000\00064 * l1d.replacement / 1e9 / duration_time\000\000\000\000\000\000\000\00000"
7575;
7676
7777static const struct compact_pmu_event pmu_events__common_tool [] = {
@@ -107,21 +107,21 @@ static const struct compact_pmu_event pmu_events__test_soc_cpu_default_core[] =
107107{ 1373 }, /* segment_reg_loads.any\000other\000Number of segment register loads\000event=6,period=200000,umask=0x80\000\00000\000\000\000\000\000 */
108108};
109109static const struct compact_pmu_event pmu_events__test_soc_cpu_hisi_sccl_ddrc [] = {
110- { 1741 }, /* uncore_hisi_ddrc.flux_wcmd\000uncore\000DDRC write commands\000event=2\000\00000\000\000\000\000DDRC write commands \000 */
110+ { 1741 }, /* uncore_hisi_ddrc.flux_wcmd\000uncore\000DDRC write commands\000event=2\000\00000\000\000\000\000 \000 */
111111};
112112static const struct compact_pmu_event pmu_events__test_soc_cpu_hisi_sccl_l3c [] = {
113- { 2232 }, /* uncore_hisi_l3c.rd_hit_cpipe\000uncore\000Total read hits\000event=7\000\00000\000\000\000\000Total read hits \000 */
113+ { 2103 }, /* uncore_hisi_l3c.rd_hit_cpipe\000uncore\000Total read hits\000event=7\000\00000\000\000\000\000 \000 */
114114};
115115static const struct compact_pmu_event pmu_events__test_soc_cpu_uncore_cbox [] = {
116- { 2076 }, /* event-hyphen\000uncore\000UNC_CBO_HYPHEN\000event=0xe0\000\00000\000\000\000\000UNC_CBO_HYPHEN \000 */
117- { 2144 }, /* event-two-hyph\000uncore\000UNC_CBO_TWO_HYPH\000event=0xc0\000\00000\000\000\000\000UNC_CBO_TWO_HYPH \000 */
118- { 1842 }, /* unc_cbo_xsnp_response.miss_eviction\000uncore\000A cross-core snoop resulted from L3 Eviction which misses in some processor core\000event=0x22,umask=0x81\000\00000\000\000\000\000A cross-core snoop resulted from L3 Eviction which misses in some processor core \000 */
116+ { 1977 }, /* event-hyphen\000uncore\000UNC_CBO_HYPHEN\000event=0xe0\000\00000\000\000\000\000 \000 */
117+ { 2031 }, /* event-two-hyph\000uncore\000UNC_CBO_TWO_HYPH\000event=0xc0\000\00000\000\000\000\000 \000 */
118+ { 1823 }, /* unc_cbo_xsnp_response.miss_eviction\000uncore\000A cross-core snoop resulted from L3 Eviction which misses in some processor core\000event=0x22,umask=0x81\000\00000\000\000\000\000 \000 */
119119};
120120static const struct compact_pmu_event pmu_events__test_soc_cpu_uncore_imc [] = {
121- { 2448 }, /* uncore_imc.cache_hits\000uncore\000Total cache hits\000event=0x34\000\00000\000\000\000\000Total cache hits \000 */
121+ { 2286 }, /* uncore_imc.cache_hits\000uncore\000Total cache hits\000event=0x34\000\00000\000\000\000\000 \000 */
122122};
123123static const struct compact_pmu_event pmu_events__test_soc_cpu_uncore_imc_free_running [] = {
124- { 2339 }, /* uncore_imc_free_running.cache_miss\000uncore\000Total cache misses\000event=0x12\000\00000\000\000\000\000Total cache misses \000 */
124+ { 2195 }, /* uncore_imc_free_running.cache_miss\000uncore\000Total cache misses\000event=0x12\000\00000\000\000\000\000 \000 */
125125
126126};
127127
@@ -139,41 +139,41 @@ const struct pmu_table_entry pmu_events__test_soc_cpu[] = {
139139{
140140 .entries = pmu_events__test_soc_cpu_hisi_sccl_l3c ,
141141 .num_entries = ARRAY_SIZE (pmu_events__test_soc_cpu_hisi_sccl_l3c ),
142- .pmu_name = { 2218 /* hisi_sccl,l3c\000 */ },
142+ .pmu_name = { 2089 /* hisi_sccl,l3c\000 */ },
143143},
144144{
145145 .entries = pmu_events__test_soc_cpu_uncore_cbox ,
146146 .num_entries = ARRAY_SIZE (pmu_events__test_soc_cpu_uncore_cbox ),
147- .pmu_name = { 1830 /* uncore_cbox\000 */ },
147+ .pmu_name = { 1811 /* uncore_cbox\000 */ },
148148},
149149{
150150 .entries = pmu_events__test_soc_cpu_uncore_imc ,
151151 .num_entries = ARRAY_SIZE (pmu_events__test_soc_cpu_uncore_imc ),
152- .pmu_name = { 2437 /* uncore_imc\000 */ },
152+ .pmu_name = { 2275 /* uncore_imc\000 */ },
153153},
154154{
155155 .entries = pmu_events__test_soc_cpu_uncore_imc_free_running ,
156156 .num_entries = ARRAY_SIZE (pmu_events__test_soc_cpu_uncore_imc_free_running ),
157- .pmu_name = { 2315 /* uncore_imc_free_running\000 */ },
157+ .pmu_name = { 2171 /* uncore_imc_free_running\000 */ },
158158},
159159};
160160
161161static const struct compact_pmu_event pmu_metrics__test_soc_cpu_default_core [] = {
162- { 2882 }, /* CPI\000\0001 / IPC\000\000\000\000\000\000\000\00000 */
163- { 3563 }, /* DCache_L2_All\000\000DCache_L2_All_Hits + DCache_L2_All_Miss\000\000\000\000\000\000\000\00000 */
164- { 3335 }, /* DCache_L2_All_Hits\000\000l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit\000\000\000\000\000\000\000\00000 */
165- { 3429 }, /* DCache_L2_All_Miss\000\000max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss\000\000\000\000\000\000\000\00000 */
166- { 3627 }, /* DCache_L2_Hits\000\000d_ratio(DCache_L2_All_Hits, DCache_L2_All)\000\000\000\000\000\000\000\00000 */
167- { 3695 }, /* DCache_L2_Misses\000\000d_ratio(DCache_L2_All_Miss, DCache_L2_All)\000\000\000\000\000\000\000\00000 */
168- { 2967 }, /* Frontend_Bound_SMT\000\000idq_uops_not_delivered.core / (4 * (cpu_clk_unhalted.thread / 2 * (1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk)))\000\000\000\000\000\000\000\00000 */
169- { 2904 }, /* IPC\000group1\000inst_retired.any / cpu_clk_unhalted.thread\000\000\000\000\000\000\000\00000 */
170- { 3829 }, /* L1D_Cache_Fill_BW\000\00064 * l1d.replacement / 1e9 / duration_time\000\000\000\000\000\000\000\00000 */
171- { 3765 }, /* M1\000\000ipc + M2\000\000\000\000\000\000\000\00000 */
172- { 3787 }, /* M2\000\000ipc + M1\000\000\000\000\000\000\000\00000 */
173- { 3809 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
174- { 3264 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
175- { 3133 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
176- { 3197 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
162+ { 2704 }, /* CPI\000\0001 / IPC\000\000\000\000\000\000\000\00000 */
163+ { 3385 }, /* DCache_L2_All\000\000DCache_L2_All_Hits + DCache_L2_All_Miss\000\000\000\000\000\000\000\00000 */
164+ { 3157 }, /* DCache_L2_All_Hits\000\000l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit\000\000\000\000\000\000\000\00000 */
165+ { 3251 }, /* DCache_L2_All_Miss\000\000max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss\000\000\000\000\000\000\000\00000 */
166+ { 3449 }, /* DCache_L2_Hits\000\000d_ratio(DCache_L2_All_Hits, DCache_L2_All)\000\000\000\000\000\000\000\00000 */
167+ { 3517 }, /* DCache_L2_Misses\000\000d_ratio(DCache_L2_All_Miss, DCache_L2_All)\000\000\000\000\000\000\000\00000 */
168+ { 2789 }, /* Frontend_Bound_SMT\000\000idq_uops_not_delivered.core / (4 * (cpu_clk_unhalted.thread / 2 * (1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk)))\000\000\000\000\000\000\000\00000 */
169+ { 2726 }, /* IPC\000group1\000inst_retired.any / cpu_clk_unhalted.thread\000\000\000\000\000\000\000\00000 */
170+ { 3651 }, /* L1D_Cache_Fill_BW\000\00064 * l1d.replacement / 1e9 / duration_time\000\000\000\000\000\000\000\00000 */
171+ { 3587 }, /* M1\000\000ipc + M2\000\000\000\000\000\000\000\00000 */
172+ { 3609 }, /* M2\000\000ipc + M1\000\000\000\000\000\000\000\00000 */
173+ { 3631 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
174+ { 3086 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
175+ { 2955 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
176+ { 3019 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
177177
178178};
179179
@@ -186,31 +186,31 @@ const struct pmu_table_entry pmu_metrics__test_soc_cpu[] = {
186186};
187187
188188static const struct compact_pmu_event pmu_events__test_soc_sys_uncore_sys_ccn_pmu [] = {
189- { 2643 }, /* sys_ccn_pmu.read_cycles\000uncore\000ccn read-cycles event\000config=0x2c\0000x01\00000\000\000\000\000\000 */
189+ { 2465 }, /* sys_ccn_pmu.read_cycles\000uncore\000ccn read-cycles event\000config=0x2c\0000x01\00000\000\000\000\000\000 */
190190};
191191static const struct compact_pmu_event pmu_events__test_soc_sys_uncore_sys_cmn_pmu [] = {
192- { 2739 }, /* sys_cmn_pmu.hnf_cache_miss\000uncore\000Counts total cache misses in first lookup result (high priority)\000eventid=1,type=5\000(434|436|43c|43a).*\00000\000\000\000\000\000 */
192+ { 2561 }, /* sys_cmn_pmu.hnf_cache_miss\000uncore\000Counts total cache misses in first lookup result (high priority)\000eventid=1,type=5\000(434|436|43c|43a).*\00000\000\000\000\000\000 */
193193};
194194static const struct compact_pmu_event pmu_events__test_soc_sys_uncore_sys_ddr_pmu [] = {
195- { 2548 }, /* sys_ddr_pmu.write_cycles\000uncore\000ddr write-cycles event\000event=0x2b\000v8\00000\000\000\000\000\000 */
195+ { 2370 }, /* sys_ddr_pmu.write_cycles\000uncore\000ddr write-cycles event\000event=0x2b\000v8\00000\000\000\000\000\000 */
196196
197197};
198198
199199const struct pmu_table_entry pmu_events__test_soc_sys [] = {
200200{
201201 .entries = pmu_events__test_soc_sys_uncore_sys_ccn_pmu ,
202202 .num_entries = ARRAY_SIZE (pmu_events__test_soc_sys_uncore_sys_ccn_pmu ),
203- .pmu_name = { 2624 /* uncore_sys_ccn_pmu\000 */ },
203+ .pmu_name = { 2446 /* uncore_sys_ccn_pmu\000 */ },
204204},
205205{
206206 .entries = pmu_events__test_soc_sys_uncore_sys_cmn_pmu ,
207207 .num_entries = ARRAY_SIZE (pmu_events__test_soc_sys_uncore_sys_cmn_pmu ),
208- .pmu_name = { 2720 /* uncore_sys_cmn_pmu\000 */ },
208+ .pmu_name = { 2542 /* uncore_sys_cmn_pmu\000 */ },
209209},
210210{
211211 .entries = pmu_events__test_soc_sys_uncore_sys_ddr_pmu ,
212212 .num_entries = ARRAY_SIZE (pmu_events__test_soc_sys_uncore_sys_ddr_pmu ),
213- .pmu_name = { 2529 /* uncore_sys_ddr_pmu\000 */ },
213+ .pmu_name = { 2351 /* uncore_sys_ddr_pmu\000 */ },
214214},
215215};
216216
0 commit comments