@@ -86,8 +86,7 @@ enum counter_scope { SCOPE_CPU, SCOPE_CORE, SCOPE_PACKAGE };
86
86
enum counter_type { COUNTER_ITEMS , COUNTER_CYCLES , COUNTER_SECONDS , COUNTER_USEC , COUNTER_K2M };
87
87
enum counter_format { FORMAT_RAW , FORMAT_DELTA , FORMAT_PERCENT , FORMAT_AVERAGE };
88
88
enum amperf_source { AMPERF_SOURCE_PERF , AMPERF_SOURCE_MSR };
89
- enum rapl_source { RAPL_SOURCE_NONE , RAPL_SOURCE_PERF , RAPL_SOURCE_MSR };
90
- enum cstate_source { CSTATE_SOURCE_NONE , CSTATE_SOURCE_PERF , CSTATE_SOURCE_MSR };
89
+ enum counter_source { COUNTER_SOURCE_NONE , COUNTER_SOURCE_PERF , COUNTER_SOURCE_MSR };
91
90
92
91
struct sysfs_path {
93
92
char path [PATH_BYTES ];
@@ -1081,7 +1080,7 @@ enum rapl_unit {
1081
1080
1082
1081
struct rapl_counter_info_t {
1083
1082
unsigned long long data [NUM_RAPL_COUNTERS ];
1084
- enum rapl_source source [NUM_RAPL_COUNTERS ];
1083
+ enum counter_source source [NUM_RAPL_COUNTERS ];
1085
1084
unsigned long long flags [NUM_RAPL_COUNTERS ];
1086
1085
double scale [NUM_RAPL_COUNTERS ];
1087
1086
enum rapl_unit unit [NUM_RAPL_COUNTERS ];
@@ -1243,7 +1242,7 @@ enum ccstate_rci_index {
1243
1242
1244
1243
struct cstate_counter_info_t {
1245
1244
unsigned long long data [NUM_CSTATE_COUNTERS ];
1246
- enum cstate_source source [NUM_CSTATE_COUNTERS ];
1245
+ enum counter_source source [NUM_CSTATE_COUNTERS ];
1247
1246
unsigned long long msr [NUM_CSTATE_COUNTERS ];
1248
1247
int fd_perf_core ;
1249
1248
int fd_perf_pkg ;
@@ -3601,7 +3600,7 @@ size_t rapl_counter_info_count_perf(const struct rapl_counter_info_t *rci)
3601
3600
size_t ret = 0 ;
3602
3601
3603
3602
for (int i = 0 ; i < NUM_RAPL_COUNTERS ; ++ i )
3604
- if (rci -> source [i ] == RAPL_SOURCE_PERF )
3603
+ if (rci -> source [i ] == COUNTER_SOURCE_PERF )
3605
3604
++ ret ;
3606
3605
3607
3606
return ret ;
@@ -3612,7 +3611,7 @@ static size_t cstate_counter_info_count_perf(const struct cstate_counter_info_t
3612
3611
size_t ret = 0 ;
3613
3612
3614
3613
for (int i = 0 ; i < NUM_CSTATE_COUNTERS ; ++ i )
3615
- if (cci -> source [i ] == CSTATE_SOURCE_PERF )
3614
+ if (cci -> source [i ] == COUNTER_SOURCE_PERF )
3616
3615
++ ret ;
3617
3616
3618
3617
return ret ;
@@ -3653,10 +3652,10 @@ int get_rapl_counters(int cpu, unsigned int domain, struct core_data *c, struct
3653
3652
3654
3653
for (unsigned int i = 0 , pi = 1 ; i < NUM_RAPL_COUNTERS ; ++ i ) {
3655
3654
switch (rci -> source [i ]) {
3656
- case RAPL_SOURCE_NONE :
3655
+ case COUNTER_SOURCE_NONE :
3657
3656
break ;
3658
3657
3659
- case RAPL_SOURCE_PERF :
3658
+ case COUNTER_SOURCE_PERF :
3660
3659
assert (pi < ARRAY_SIZE (perf_data ));
3661
3660
assert (rci -> fd_perf != -1 );
3662
3661
@@ -3669,7 +3668,7 @@ int get_rapl_counters(int cpu, unsigned int domain, struct core_data *c, struct
3669
3668
++ pi ;
3670
3669
break ;
3671
3670
3672
- case RAPL_SOURCE_MSR :
3671
+ case COUNTER_SOURCE_MSR :
3673
3672
if (debug )
3674
3673
fprintf (stderr , "Reading rapl counter via msr at %u\n" , i );
3675
3674
@@ -3791,10 +3790,10 @@ int get_cstate_counters(unsigned int cpu, struct thread_data *t, struct core_dat
3791
3790
3792
3791
for (unsigned int i = 0 , pi = 0 ; i < NUM_CSTATE_COUNTERS ; ++ i ) {
3793
3792
switch (cci -> source [i ]) {
3794
- case CSTATE_SOURCE_NONE :
3793
+ case COUNTER_SOURCE_NONE :
3795
3794
break ;
3796
3795
3797
- case CSTATE_SOURCE_PERF :
3796
+ case COUNTER_SOURCE_PERF :
3798
3797
assert (pi < ARRAY_SIZE (perf_data ));
3799
3798
assert (cci -> fd_perf_core != -1 || cci -> fd_perf_pkg != -1 );
3800
3799
@@ -3807,7 +3806,7 @@ int get_cstate_counters(unsigned int cpu, struct thread_data *t, struct core_dat
3807
3806
++ pi ;
3808
3807
break ;
3809
3808
3810
- case CSTATE_SOURCE_MSR :
3809
+ case COUNTER_SOURCE_MSR :
3811
3810
assert (!no_msr );
3812
3811
if (get_msr (cpu , cci -> msr [i ], & cci -> data [i ]))
3813
3812
return -13 - i ;
@@ -3828,7 +3827,7 @@ int get_cstate_counters(unsigned int cpu, struct thread_data *t, struct core_dat
3828
3827
* when invoked for the thread sibling.
3829
3828
*/
3830
3829
#define PERF_COUNTER_WRITE_DATA (out_counter , index ) do { \
3831
- if (cci->source[index] != CSTATE_SOURCE_NONE ) \
3830
+ if (cci->source[index] != COUNTER_SOURCE_NONE ) \
3832
3831
out_counter = cci->data[index]; \
3833
3832
} while (0)
3834
3833
@@ -6894,7 +6893,7 @@ void rapl_perf_init(void)
6894
6893
rci -> fd_perf = -1 ;
6895
6894
for (size_t i = 0 ; i < NUM_RAPL_COUNTERS ; ++ i ) {
6896
6895
rci -> data [i ] = 0 ;
6897
- rci -> source [i ] = RAPL_SOURCE_NONE ;
6896
+ rci -> source [i ] = COUNTER_SOURCE_NONE ;
6898
6897
}
6899
6898
}
6900
6899
@@ -6936,14 +6935,14 @@ void rapl_perf_init(void)
6936
6935
/* Use perf API for this counter */
6937
6936
if (!no_perf && cai -> perf_name
6938
6937
&& add_rapl_perf_counter (cpu , rci , cai , & scale , & unit ) != -1 ) {
6939
- rci -> source [cai -> rci_index ] = RAPL_SOURCE_PERF ;
6938
+ rci -> source [cai -> rci_index ] = COUNTER_SOURCE_PERF ;
6940
6939
rci -> scale [cai -> rci_index ] = scale * cai -> compat_scale ;
6941
6940
rci -> unit [cai -> rci_index ] = unit ;
6942
6941
rci -> flags [cai -> rci_index ] = cai -> flags ;
6943
6942
6944
6943
/* Use MSR for this counter */
6945
6944
} else if (!no_msr && cai -> msr && probe_msr (cpu , cai -> msr ) == 0 ) {
6946
- rci -> source [cai -> rci_index ] = RAPL_SOURCE_MSR ;
6945
+ rci -> source [cai -> rci_index ] = COUNTER_SOURCE_MSR ;
6947
6946
rci -> msr [cai -> rci_index ] = cai -> msr ;
6948
6947
rci -> msr_mask [cai -> rci_index ] = cai -> msr_mask ;
6949
6948
rci -> msr_shift [cai -> rci_index ] = cai -> msr_shift ;
@@ -6953,7 +6952,7 @@ void rapl_perf_init(void)
6953
6952
}
6954
6953
}
6955
6954
6956
- if (rci -> source [cai -> rci_index ] != RAPL_SOURCE_NONE )
6955
+ if (rci -> source [cai -> rci_index ] != COUNTER_SOURCE_NONE )
6957
6956
has_counter = 1 ;
6958
6957
}
6959
6958
@@ -7146,17 +7145,17 @@ void cstate_perf_init_(bool soft_c1)
7146
7145
/* Use perf API for this counter */
7147
7146
if (!no_perf && cai -> perf_name && add_cstate_perf_counter (cpu , cci , cai ) != -1 ) {
7148
7147
7149
- cci -> source [cai -> rci_index ] = CSTATE_SOURCE_PERF ;
7148
+ cci -> source [cai -> rci_index ] = COUNTER_SOURCE_PERF ;
7150
7149
7151
7150
/* User MSR for this counter */
7152
7151
} else if (!no_msr && cai -> msr && pkg_cstate_limit >= cai -> pkg_cstate_limit
7153
7152
&& probe_msr (cpu , cai -> msr ) == 0 ) {
7154
- cci -> source [cai -> rci_index ] = CSTATE_SOURCE_MSR ;
7153
+ cci -> source [cai -> rci_index ] = COUNTER_SOURCE_MSR ;
7155
7154
cci -> msr [cai -> rci_index ] = cai -> msr ;
7156
7155
}
7157
7156
}
7158
7157
7159
- if (cci -> source [cai -> rci_index ] != CSTATE_SOURCE_NONE ) {
7158
+ if (cci -> source [cai -> rci_index ] != COUNTER_SOURCE_NONE ) {
7160
7159
has_counter = true;
7161
7160
cores_visited [core_id ] = true;
7162
7161
pkg_visited [pkg_id ] = true;
0 commit comments