[LLDB] Testsuite: Add helper to check for AArch64 target

[omjavaid]

Summary

This patch adds a helper function to test target architecture is AArch64 or not. This also tightens isAArch64* helpers by adding an extra architecture check.

[DavidSpickett]

lldb/packages/Python/lldbsuite/test/lldbtest.py

1296

This can be:

return self.getArchitecture().lower() == "aarch64"

Unless you're expecting "aarch64_be" or "aarch64_32" as well.

return "aarch64" in self.getArchitecture().lower()

Not sure if lldb just has the single name.

[omjavaid]

lldb/packages/Python/lldbsuite/test/lldbtest.py

1296

This was intentional as I wanted to keep this helper checking for platform architecture regardless of ABI or endianess. For an ILP32 inferior or be inferior our Native* are same as normal aarch64.

[DavidSpickett]

lldb/packages/Python/lldbsuite/test/lldbtest.py

1296

I still think

return self.getArchitecture().lower() == "aarch64"

Is the same thing unless you intend to expand the list.

(but I understand what you're doing and either way works just a bit less neat IMO)

[omjavaid]

lldb/packages/Python/lldbsuite/test/lldbtest.py

1296

Oh yes agreed, I dunno what I was thinking :) Let me fix this.

[omjavaid]

This fixes issue raised in last rev.

[DavidSpickett]

LGTM

lldb/packages/Python/lldbsuite/test/lldbtest.py

def getCPUInfo(self):
         try:
             with open(cpuinfo_path, 'r') as f:
                 cpuinfo = f.read()
         except:
             return ""
 
         return cpuinfo
 
+    def isAArch64(self):
+        """Returns true if the architecture is AArch64."""
+        return self.getArchitecture().lower() == "aarch64"
+
     def isAArch64SVE(self):
-        return "sve" in self.getCPUInfo()
+        return self.isAArch64() and "sve" in self.getCPUInfo()
 
     def isAArch64MTE(self):
-        return "mte" in self.getCPUInfo()
+        return self.isAArch64() and "mte" in self.getCPUInfo()
 
     def isAArch64PAuth(self):
-        return "paca" in self.getCPUInfo()
+        return self.isAArch64() and "paca" in self.getCPUInfo()
 
     def getArchitecture(self):
         """Returns the architecture in effect the test suite is running with."""
         module = builder_module()
         arch = module.getArchitecture()
         if arch == 'amd64':
             arch = 'x86_64'
         if arch in ['armv7l', 'armv8l'] :

lldb/test/API/functionalities/memory/tag/TestMemoryTag.py

def test_memory_tag_read_unsupported(self):
         lldbutil.run_break_set_by_file_and_line(self, "main.cpp",
                             line_number('main.cpp', '// Breakpoint here'),
                                         num_expected_locations=1)
         self.runCmd("run", RUN_SUCCEEDED)
 
         # If you're on AArch64 you could have MTE but the remote process
         # must also support it. If you're on any other arhcitecture you
         # won't have any tagging at all. So the error message is different.
-        if self.getArchitecture() == "aarch64":
+        if self.isAArch64():
             expected = "error: Process does not support memory tagging"
         else:
             expected = "error: This architecture does not support memory tagging"
 
         self.expect("memory tag read 0 1", substrs=[expected], error=True)

lldb/test/API/functionalities/return-value/TestReturnValue.py

 from lldbsuite.test import lldbutil
 
 
 class ReturnValueTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     def affected_by_pr33042(self):
-        return ("clang" in self.getCompiler() and self.getArchitecture() ==
-            "aarch64" and self.getPlatform() == "linux")
+        return ("clang" in self.getCompiler() and self.isAArch64() and
+            self.getPlatform() == "linux")
 
     def affected_by_pr44132(self):
         return (self.getArchitecture() in ["aarch64", "arm"] and
                 self.getPlatform() in ["freebsd", "linux"])
 
     # ABIMacOSX_arm can't fetch simple values inside a structure
     def affected_by_radar_34562999(self):
         return (self.getArchitecture() == 'armv7' or self.getArchitecture() == 'armv7k') and self.platformIsDarwin()

lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py

def test_g_target_xml_returns_correct_data(self):
         for register in zip(target_xml_registers, q_info_registers):
             xml_info_reg = register[0]
             q_info_reg = register[1]
             self.assertEqual(q_info_reg["name"], xml_info_reg.get("name"))
             self.assertEqual(q_info_reg["set"], xml_info_reg.get("group"))
             self.assertEqual(q_info_reg["format"], xml_info_reg.get("format"))
             self.assertEqual(q_info_reg["bitsize"], xml_info_reg.get("bitsize"))
 
-            if not self.getArchitecture() == 'aarch64':
+            if not self.isAArch64():
                 self.assertEqual(q_info_reg["offset"], xml_info_reg.get("offset"))
 
             self.assertEqual(q_info_reg["encoding"], xml_info_reg.get("encoding"))