type field of perf_event_attr.config must not be used when raw_type field is set

soramichi · opcm · commit 769c8ddd440a · 2018-11-06T11:29:12.000+01:00
diff --git a/cpucounters.cpp b/cpucounters.cpp
@@ -2212,7 +2212,7 @@ PCM::ErrorCode PCM::program(const PCM::ProgramMode mode_, const void * parameter
             if(canUsePerf)
             {
                 e.type = PERF_TYPE_RAW;
-                e.config = (1ULL<<63ULL) + (((long long unsigned)PERF_TYPE_RAW)<<(64ULL-8ULL)) + event_select_reg.value;
+		e.config = (1ULL<<63ULL) + event_select_reg.value;
                 if (event_select_reg.fields.event_select == OFFCORE_RESPONSE_0_EVTNR)
                     e.config1 = pExtDesc->OffcoreResponseMsrValue[0];
                 if (event_select_reg.fields.event_select == OFFCORE_RESPONSE_1_EVTNR)

Original file line number	Diff line number	Diff line change
`@@ -2212,7 +2212,7 @@ PCM::ErrorCode PCM::program(const PCM::ProgramMode mode_, const void * parameter`
`2212`	`2212`	`if(canUsePerf)`
`2213`	`2213`	`{`
`2214`	`2214`	`e.type = PERF_TYPE_RAW;`
`2215`		`- e.config = (1ULL<<63ULL) + (((long long unsigned)PERF_TYPE_RAW)<<(64ULL-8ULL)) + event_select_reg.value;`
	`2215`	`+ e.config = (1ULL<<63ULL) + event_select_reg.value;`
`2216`	`2216`	`if (event_select_reg.fields.event_select == OFFCORE_RESPONSE_0_EVTNR)`
`2217`	`2217`	`e.config1 = pExtDesc->OffcoreResponseMsrValue[0];`
`2218`	`2218`	`if (event_select_reg.fields.event_select == OFFCORE_RESPONSE_1_EVTNR)`