refactoring

Change-Id: Id9bda613bd52e32963e8cf77f4d6e17534b8b49c

Author: rdementi

src/types.h

@@ -148,25 +148,13 @@ constexpr auto ARCH_LLC_REFERENCE_UMASK = 0x4F;
 
 constexpr auto ARCH_LLC_MISS_EVTNR = 0x2E;
 constexpr auto ARCH_LLC_MISS_UMASK = 0x41;
-// Atom on-core events
-
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_UMASK   (0x01)
-
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_UMASK   (0x02)
 
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_UMASK   (0x01)
-
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_UMASK   (0x02)
-
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_HIT_UMASK   (0x01)
+// Atom on-core events
+constexpr auto ATOM_MEM_LOAD_RETIRED_L2_HIT_EVTNR = 0xCB;
+constexpr auto ATOM_MEM_LOAD_RETIRED_L2_HIT_UMASK = 0x01;
 
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_EVTNR   (0xCB)
-#define ATOM_MEM_LOAD_RETIRED_L2_MISS_UMASK   (0x02)
+constexpr auto ATOM_MEM_LOAD_RETIRED_L2_MISS_EVTNR = 0xCB;
+constexpr auto ATOM_MEM_LOAD_RETIRED_L2_MISS_UMASK = 0x02;
 
 // Offcore response events
 constexpr auto OFFCORE_RESPONSE_0_EVTNR = 0xB7;
@@ -186,45 +174,41 @@ constexpr auto FRONTEND_UMASK = 0x01;
 */
 
 // Uncore msrs
-
-#define MSR_UNCORE_PERF_GLOBAL_CTRL_ADDR        (0x391)
-
-#define MSR_UNCORE_PERFEVTSEL0_ADDR             (0x3C0)
-#define MSR_UNCORE_PERFEVTSEL1_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 1)
-#define MSR_UNCORE_PERFEVTSEL2_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 2)
-#define MSR_UNCORE_PERFEVTSEL3_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 3)
-#define MSR_UNCORE_PERFEVTSEL4_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 4)
-#define MSR_UNCORE_PERFEVTSEL5_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 5)
-#define MSR_UNCORE_PERFEVTSEL6_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 6)
-#define MSR_UNCORE_PERFEVTSEL7_ADDR             (MSR_UNCORE_PERFEVTSEL0_ADDR + 7)
-
-
-#define MSR_UNCORE_PMC0                         (0x3B0)
-#define MSR_UNCORE_PMC1                         (MSR_UNCORE_PMC0 + 1)
-#define MSR_UNCORE_PMC2                         (MSR_UNCORE_PMC0 + 2)
-#define MSR_UNCORE_PMC3                         (MSR_UNCORE_PMC0 + 3)
-#define MSR_UNCORE_PMC4                         (MSR_UNCORE_PMC0 + 4)
-#define MSR_UNCORE_PMC5                         (MSR_UNCORE_PMC0 + 5)
-#define MSR_UNCORE_PMC6                         (MSR_UNCORE_PMC0 + 6)
-#define MSR_UNCORE_PMC7                         (MSR_UNCORE_PMC0 + 7)
+constexpr auto MSR_UNCORE_PERF_GLOBAL_CTRL_ADDR = 0x391;
+
+constexpr auto MSR_UNCORE_PERFEVTSEL0_ADDR = 0x3C0;
+constexpr auto MSR_UNCORE_PERFEVTSEL1_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 1;
+constexpr auto MSR_UNCORE_PERFEVTSEL2_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 2;
+constexpr auto MSR_UNCORE_PERFEVTSEL3_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 3;
+constexpr auto MSR_UNCORE_PERFEVTSEL4_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 4;
+constexpr auto MSR_UNCORE_PERFEVTSEL5_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 5;
+constexpr auto MSR_UNCORE_PERFEVTSEL6_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 6;
+constexpr auto MSR_UNCORE_PERFEVTSEL7_ADDR = MSR_UNCORE_PERFEVTSEL0_ADDR + 7;
+
+constexpr auto MSR_UNCORE_PMC0 = 0x3B0;
+constexpr auto MSR_UNCORE_PMC1 = MSR_UNCORE_PMC0 + 1;
+constexpr auto MSR_UNCORE_PMC2 = MSR_UNCORE_PMC0 + 2;
+constexpr auto MSR_UNCORE_PMC3 = MSR_UNCORE_PMC0 + 3;
+constexpr auto MSR_UNCORE_PMC4 = MSR_UNCORE_PMC0 + 4;
+constexpr auto MSR_UNCORE_PMC5 = MSR_UNCORE_PMC0 + 5;
+constexpr auto MSR_UNCORE_PMC6 = MSR_UNCORE_PMC0 + 6;
+constexpr auto MSR_UNCORE_PMC7 = MSR_UNCORE_PMC0 + 7;
 
 // Uncore event IDs
+constexpr auto UNC_QMC_WRITES_FULL_ANY_EVTNR = 0x2F;
+constexpr auto UNC_QMC_WRITES_FULL_ANY_UMASK = 0x07;
 
-#define UNC_QMC_WRITES_FULL_ANY_EVTNR           (0x2F)
-#define UNC_QMC_WRITES_FULL_ANY_UMASK           (0x07)
-
-#define UNC_QMC_NORMAL_READS_ANY_EVTNR          (0x2C)
-#define UNC_QMC_NORMAL_READS_ANY_UMASK          (0x07)
-
-#define UNC_QHL_REQUESTS_EVTNR                  (0x20)
+constexpr auto UNC_QMC_NORMAL_READS_ANY_EVTNR = 0x2C;
+constexpr auto UNC_QMC_NORMAL_READS_ANY_UMASK = 0x07;
 
-#define UNC_QHL_REQUESTS_IOH_READS_UMASK        (0x01)
-#define UNC_QHL_REQUESTS_IOH_WRITES_UMASK       (0x02)
-#define UNC_QHL_REQUESTS_REMOTE_READS_UMASK     (0x04)
-#define UNC_QHL_REQUESTS_REMOTE_WRITES_UMASK    (0x08)
-#define UNC_QHL_REQUESTS_LOCAL_READS_UMASK      (0x10)
-#define UNC_QHL_REQUESTS_LOCAL_WRITES_UMASK     (0x20)
+constexpr auto UNC_QHL_REQUESTS_EVTNR = 0x20;
 
+constexpr auto UNC_QHL_REQUESTS_IOH_READS_UMASK = 0x01;
+constexpr auto UNC_QHL_REQUESTS_IOH_WRITES_UMASK = 0x02;
+constexpr auto UNC_QHL_REQUESTS_REMOTE_READS_UMASK = 0x04;
+constexpr auto UNC_QHL_REQUESTS_REMOTE_WRITES_UMASK = 0x08;
+constexpr auto UNC_QHL_REQUESTS_LOCAL_READS_UMASK = 0x10;
+constexpr auto UNC_QHL_REQUESTS_LOCAL_WRITES_UMASK = 0x20;
 /*
         From "Intel(r) Xeon(r) Processor 7500 Series Uncore Programming Guide"
 */