twister: drop riscv32/64 support

riscv32/64 are no longer supported, as both are the same arch: riscv.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

scripts/ci/test_plan.py

@@ -182,8 +182,6 @@ class Filters:
 
     def find_archs(self):
         # we match both arch/<arch>/* and include/zephyr/arch/<arch> and skip common.
-        # Some architectures like riscv require special handling, i.e. riscv
-        # directory covers 2 architectures known to twister: riscv32 and riscv64.
         archs = set()
 
         for f in self.modified_files:
@@ -192,12 +190,7 @@ class Filters:
                 p = re.match(r"^include\/zephyr\/arch\/([^/]+)\/", f)
             if p:
                 if p.group(1) != 'common':
-                    if p.group(1) == 'riscv':
-                        archs.add('riscv')
-                        archs.add('riscv32')
-                        archs.add('riscv64')
-                    else:
-                        archs.add(p.group(1))
+                    archs.add(p.group(1))
                     # Modified file is treated as resolved, since a matching scope was found
                     self.resolved_files.append(f)
 

scripts/pylib/twister/twisterlib/platform.py

@@ -88,8 +88,6 @@ class Platform:
           "arm64": ["zephyr", "cross-compile"],
           "mips": ["zephyr", "xtools"],
           "nios2": ["zephyr", "xtools"],
-          "riscv32": ["zephyr", "cross-compile", "xtools"],
-          "riscv64": ["zephyr"],
           "riscv": ["zephyr", "cross-compile"],
           "posix": ["host", "llvm"],
           "sparc": ["zephyr", "xtools"],

scripts/tests/twister/test_platform.py

@@ -49,7 +49,7 @@ arch: arch0
     (
 """\
 identifier: dummy full
-arch: riscv32
+arch: riscv
 twister: true
 ram: 1024
 testing:
@@ -81,7 +81,7 @@ env:
 """,
         {
             'name': 'dummy full',
-            'arch': 'riscv32',
+            'arch': 'riscv',
             'twister': True,
             'ram': 1024,
             'timeout_multiplier': 2.0,
@@ -96,11 +96,11 @@ env:
             'type': 'unit',
             'simulation': 'nsim',
             'simulation_exec': 'nsimdrv',
-            'supported_toolchains': ['zephyr', 'llvm', 'cross-compile', 'xtools'],
+            'supported_toolchains': ['zephyr', 'llvm', 'cross-compile'],
             'env': ['dummynonexistentvar'],
             'env_satisfied': False
         },
-        '<dummy full on riscv32>'
+        '<dummy full on riscv>'
     ),
 ]