10951 10895 unfixed 10146

*** 992,1002 ****
                              BITMASK_XBITS(num_gpc));
                  }
          } else {
                  if (find_generic_events(event, cmn_generic_events) != NULL) {
                          bitmap |= BITMASK_XBITS(num_gpc);
!                 } if (find_generic_events(event, generic_events_pic0) != NULL) {
                          bitmap |= 1ULL;
                  } else if (find_gpcevent_core_uarch(event,
                      cmn_gpc_events_core_uarch) != NULL) {
                          bitmap |= BITMASK_XBITS(num_gpc);
                  } else if (find_gpcevent_core_uarch(event, pic0_events) !=
--- 992,1003 ----
                              BITMASK_XBITS(num_gpc));
                  }
          } else {
                  if (find_generic_events(event, cmn_generic_events) != NULL) {
                          bitmap |= BITMASK_XBITS(num_gpc);
!                 } else if (find_generic_events(event,
!                     generic_events_pic0) != NULL) {
                          bitmap |= 1ULL;
                  } else if (find_gpcevent_core_uarch(event,
                      cmn_gpc_events_core_uarch) != NULL) {
                          bitmap |= BITMASK_XBITS(num_gpc);
                  } else if (find_gpcevent_core_uarch(event, pic0_events) !=