This is following the separation of the work done in #2304 into two distinct branches, one for the Perf interface, the other for the PAPI interface.