OSDN Git Service

simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters.
authorpmc.waiver <pmc.waiver.user01@gmail.com>
Thu, 7 Nov 2019 07:54:38 +0000 (16:54 +0900)
committerYabin Cui <yabinc@google.com>
Fri, 15 Nov 2019 21:24:25 +0000 (21:24 +0000)
Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters
Test: hw counters.
Bug: 144472902
(cherry picked from commit 8a0a1ebb671bed0c910d35e71bbc083a031f7331)

Change-Id: I728ea2d83c9b89fc04d442971f76293fed9099ed

simpleperf/cmd_record_test.cpp

index 184f935..14127c6 100644 (file)
@@ -271,7 +271,8 @@ bool HasHardwareCounter() {
     if (android::base::ReadFileToString("/proc/cpuinfo", &cpu_info)) {
       std::string hardware = GetHardwareFromCpuInfo(cpu_info);
       if (std::regex_search(hardware, std::regex(R"(i\.MX6.*Quad)")) ||
-          std::regex_search(hardware, std::regex(R"(SC7731e)")) ) {
+          std::regex_search(hardware, std::regex(R"(SC7731e)")) ||
+          std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)"))) {
         has_hw_counter = 0;
       }
     }