Don't require AVX registers if the target CPU doesn't have them

[vharron]

Summary

TestLldbGdbServer was failing because it always assumed AVX is available on
x86_64 Linux. This patch checks the target before asserting that AVX
registers are available.

[vharron]

Asserting the presence/absence of AVX registers based on target capabilities

[tberghammer]

test/tools/lldb-server/TestLldbGdbServer.py

472–474

Please remove the local copy of cpuinfo for remote platforms

[emaste]

test/tools/lldb-server/TestLldbGdbServer.py

465

Would be nice to see a switch on sys.platform or equivalent even if Linux is the only case right now.

[tberghammer]

@vharron: What is the state of this CL?
Should I commandeer it and commit it in after fixing the issues requested in review?

[vharron]

It's committed. Unfortunately, it doesn't fix the error.

[vharron]

I was trying to fix it blind. I need to debug the test on virtualbox but I've decided that we should focus our energy on real device issues first.

[vharron]

Tamas/Ed, if you have any problems with my commit, I'll fix them

http://reviews.llvm.org/rL232137#2b74499f

test/tools/lldb-server/TestLldbGdbServer.py

465

done http://reviews.llvm.org/rL232137#2b74499f

472–474

done http://reviews.llvm.org/rL232137#2b74499f

[tberghammer]

I committed a followup fix as rL233194. It fixed the issue on android-x86 and I think it should fix it on other platforms also. Please check it and if you still see the failure then we should investigate it.

test/tools/lldb-server/TestLldbGdbServer.py

class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
     @llgs_test
     @dwarf_test
     def test_qRegisterInfo_contains_at_least_one_register_set_llgs_dwarf(self):
         self.init_llgs_test()
         self.buildDwarf()
         self.qRegisterInfo_contains_at_least_one_register_set()
 
-    def qRegisterInfo_contains_avx_registers_on_linux_x86_64(self):
+    def targetHasAVX(self):
+        # Need to do something different for non-Linux/Android targets
+        if lldb.remote_platform:
+            self.runCmd('platform get-file "/proc/cpuinfo" "cpuinfo"')
+            cpuinfo_path = "cpuinfo"
+        else:
+            cpuinfo_path = "/proc/cpuinfo"
+
+        f = open(cpuinfo_path, 'r')
+        cpuinfo = f.read()
+        f.close()
+        return " avx " in cpuinfo
+
+    def qRegisterInfo_contains_avx_registers(self):
         server = self.connect_to_debug_monitor()
         self.assertIsNotNone(server)
 
         # Build launch args
         launch_args = [os.path.abspath('a.out')]
 
         # Build the expected protocol stream
         self.add_no_ack_remote_stream()
         self.add_verified_launch_packets(launch_args)
         self.add_register_info_collection_packets()
 
         # Run the packet stream.
         context = self.expect_gdbremote_sequence()
         self.assertIsNotNone(context)
 
         # Gather register info entries.
         reg_infos = self.parse_register_info_packets(context)
 
         # Collect all generics found.
         register_sets = { reg_info['set']:1 for reg_info in reg_infos if 'set' in reg_info }
-        self.assertTrue("Advanced Vector Extensions" in register_sets)
+        self.assertEquals(self.targetHasAVX(), "Advanced Vector Extensions" in register_sets)
 
     @llgs_test
     @dwarf_test
-    def test_qRegisterInfo_contains_avx_registers_on_linux_x86_64_llgs_dwarf(self):
-        # Skip this test if not Linux x86_64.
-        if platform.system() != "Linux" or platform.processor() != "x86_64":
-            self.skipTest("linux x86_64 test")
-
+    def test_qRegisterInfo_contains_avx_registers_llgs_dwarf(self):
         self.init_llgs_test()
         self.buildDwarf()
-        self.qRegisterInfo_contains_avx_registers_on_linux_x86_64()
+        self.qRegisterInfo_contains_avx_registers()
 
     def qThreadInfo_contains_thread(self):
         procs = self.prep_debug_monitor_and_inferior()
         self.add_threadinfo_collection_packets()
 
         # Run the packet stream.
         context = self.expect_gdbremote_sequence()
         self.assertIsNotNone(context)