FreeRTOS: Fixes after merge

* Comply with new typing for QEMU targets
* Add xlen for 32-bit builds
* Don't use gprel branch in LLVM by default, it's only needed for
compartmentalisation
* Remove vcu118-baremetal
* Uncomment Alex's notifications in Jenkinsfile
* Remove RISC-V's RVC option as it is now enabled by default

Author: heshamelmatary

Jenkinsfile

@@ -93,11 +93,11 @@ pipeline {
   environment {
     PYTHONDONTWRITEBYTECODE = '1'
   }
-  //post {
-  //  failure {
-  //    mail(to: '[email protected]', subject: "Failed Pipeline: ${currentBuild.fullDisplayName}", body: "Something is wrong with ${env.BUILD_URL}")
-  //  }
-  // }
+  post {
+    failure {
+      mail(to: '[email protected]', subject: "Failed Pipeline: ${currentBuild.fullDisplayName}", body: "Something is wrong with ${env.BUILD_URL}")
+    }
+  }
   options {
     checkoutToSubdirectory('src')
     timestamps()

pycheribuild/config/chericonfig.py

@@ -332,9 +332,6 @@ def __init__(self, loader, action_class: "type[CheribuildActionEnum]") -> None:
         self.riscv_baremetal_hardfloat = loader.add_bool_option("riscv-baremetal-hardfloat", default=False,
             group=loader.cross_compile_options_group,
             help="Use hard floating point ABI for building CHERI-RISC-V programs")
-        self.riscv_cheri_rvc = loader.add_bool_option("riscv-cheri-rvc", default=False,
-            group=loader.cross_compile_options_group,
-            help="Build CHERI-RISC-V projects with compressed CHERI instructions support")
         self.riscv_cheri_gprel = loader.add_bool_option("riscv-cheri-gprel", default=False,
             group=loader.cross_compile_options_group,
             help="Build CHERI-RISC-V libs with gprel ABI for CheriFreeRTOS compartmentalization")

pycheribuild/config/compilation_targets.py

@@ -283,11 +283,6 @@ def essential_compiler_and_linker_flags_impl(
                 # Both RTEMS and baremetal FreeRTOS are linked above 0x80000000
                 result.append("-mcmodel=medium")
 
-            # Enable generating CHERI-RISC-V compressed instructions
-            if config.riscv_cheri_rvc:
-                if xtarget.is_cheri_hybrid() or xtarget.is_cheri_purecap():
-                    result.append("-mxcheri-rvc")
-
             if config.riscv_cheri_gprel:
                 if xtarget.is_cheri_purecap():
                     result.append("-cheri-cap-table-abi=gprel")

pycheribuild/processutils.py

@@ -229,7 +229,7 @@ def keep_terminal_sane(gave_tty_control=False, command: Optional[list] = None):
     finally:
         # Can seemingly get unwanted SIGTTOU's whilst restoring so just ignore
         # them temporarily.
-        with suppress_sigttou():
+        with suppress_sigttou(suppress=gave_tty_control):
             stdin_state.restore()
             stdout_state.restore()
             stderr_state.restore()

pycheribuild/projects/cross/freertos.py

@@ -36,7 +36,6 @@
 from .compiler_rt import BuildCompilerRtBuiltins
 from .crosscompileproject import CompilationTargets, CrossCompileAutotoolsProject, DefaultInstallDir, GitRepository
 from ..project import ComputedDefaultValue
-from ..run_qemu import LaunchQEMUBase
 
 
 class BuildFreeRTOS(CrossCompileAutotoolsProject):
@@ -84,13 +83,17 @@ def _run_waf(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.compiler_resource = self.get_compiler_info(self.CC).get_resource_dir()
+        self.xlen = 64
 
         self.default_demo_app = (
             "qemu_virt-"
             + self.target_info.get_riscv_arch_string(self.crosscompile_target, softfloat=True)
             + self.target_info.get_riscv_abi(self.crosscompile_target, softfloat=True)
         )
 
+        if "rv32" in self.target_info.get_riscv_arch_string(self.crosscompile_target, softfloat=True):
+            self.xlen = 32
+
         # Galois uses make build sysetm
         if self.demo == "RISC-V_Galois_demo":
 
@@ -274,7 +277,7 @@ def configure(self):
                           "--riscv-abi", self.target_info.get_riscv_abi(self.crosscompile_target, softfloat=True),
                           "--riscv-platform", self.platform,
                           "--program-path", program_root,
-                          "--sysroot",  str(self.sdk_sysroot) + "/riscv64-unknown-elf",
+                          "--sysroot",  str(self.sdk_sysroot) + "/riscv" + str(self.xlen) + "-unknown-elf",
                           "--mem-start", self.mem_start,
                           "--ipaddr", self.ipaddr,
                           "--gateway", self.gateway

pycheribuild/projects/cross/llvm.py

@@ -630,8 +630,7 @@ def process(self):
 
 
 class BuildCheriLLVM(BuildLLVMMonoRepoBase):
-    repository = GitRepository("https://github.com/CTSRD-CHERI/llvm-project.git",
-                               force_branch=True, default_branch="cherifreertos-gprel-dev-rebase")
+    repository = GitRepository("https://github.com/CTSRD-CHERI/llvm-project.git")
     default_directory_basename = "llvm-project"
     target = "llvm"
     skip_cheri_symlinks = False

pycheribuild/projects/run_qemu.py

@@ -39,6 +39,7 @@
 
 from .build_qemu import BuildQEMU, BuildQEMUBase, BuildUpstreamQEMU
 from .cross.cheribsd import BuildCHERIBSD, BuildCheriBsdMfsKernel, BuildFreeBSD, ConfigPlatform, KernelABI
+from .cross.freertos import BuildFreeRTOS
 from .cross.gdb import BuildGDB
 from .cross.u_boot import BuildUBoot
 from .disk_image import (
@@ -957,9 +958,11 @@ def __init__(self, *args, **kwargs):
 
 class LaunchFreeRTOSQEMU(LaunchQEMUBase):
     target = "run-freertos"
-    dependencies = ["freertos"]
-    supported_architectures = [CompilationTargets.BAREMETAL_NEWLIB_RISCV64_PURECAP,
-                               CompilationTargets.BAREMETAL_NEWLIB_RISCV64]
+    supported_architectures = (
+                               CompilationTargets.BAREMETAL_NEWLIB_RISCV32,
+                               CompilationTargets.BAREMETAL_NEWLIB_RISCV64,
+                               CompilationTargets.BAREMETAL_NEWLIB_RISCV32_PURECAP,
+                               CompilationTargets.BAREMETAL_NEWLIB_RISCV64_PURECAP)
     forward_ssh_port = False
     forward_ftp_port = True
     forward_tftp_port = True
@@ -974,6 +977,7 @@ class LaunchFreeRTOSQEMU(LaunchQEMUBase):
     qemu_user_networking = True
     _enable_smbfs_support = False
     _add_virtio_rng = False
+    _uses_disk_image = False
     ftp_forwarding_port = 10021
     tftp_forwarding_port = 10069
     nbns_forwarding_port = 10137
@@ -985,8 +989,8 @@ class LaunchFreeRTOSQEMU(LaunchQEMUBase):
     default_demo = "RISC-V-Generic"
     default_demo_app = "main_blinky"
 
-    def __init__(self, config: CheriConfig):
-        super().__init__(config)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         if self.use_virtio_blk:
             self._after_disk_options.extend([
                 "-drive", "file=" + str(BuildFreeRTOS.get_install_dir(self)) + "/FreeRTOS/Demo/bin/freertos.img,id=drv,format=raw",

pycheribuild/projects/simple_project.py

@@ -169,8 +169,7 @@ def die(msg):
             sys.exit("PseudoTarget with no dependencies should not exist!! Target name = " + target_name)
         supported_archs = cls.supported_architectures
         assert supported_archs, "Must not be empty: " + str(supported_archs)
-        print(supported_archs)
-        #assert isinstance(supported_archs, tuple)
+        assert isinstance(supported_archs, tuple)
         assert len(set(supported_archs)) == len(supported_archs), (
             "Duplicates in supported archs for " + cls.__name__ + ": " + str(supported_archs)
         )