tests: rdpmc_lib -- support both old and new styles of detection

I hadn't fully implemented this previously.