Add x86_64-uefi ci

The CI for x86_64-unknown-uefi works now. The CI for i686-unknown-uefi
does not work due to missing symbols in compiler-builtins.

Signed-off-by: Ayush <ayushsingh1325@gmail.com>

Author: Ayush1325

src/bootstrap/configure.py

@@ -146,7 +146,9 @@ def v(*args):
   "rootfs in qemu testing, you probably don't want to use this")
 v("qemu-riscv64-rootfs", "target.riscv64gc-unknown-linux-gnu.qemu-rootfs",
   "rootfs in qemu testing, you probably don't want to use this")
-v("qemu-uefi-rootfs", "target.x86_64-unknown-uefi.qemu-rootfs",
+v("qemu-x86_64-uefi-rootfs", "target.x86_64-unknown-uefi.qemu-rootfs",
+  "rootfs in qemu testing, you probably don't want to use this")
+v("qemu-i686-uefi-rootfs", "target.i686-unknown-uefi.qemu-rootfs",
   "rootfs in qemu testing, you probably don't want to use this")
 v("experimental-targets", "llvm.experimental-targets",
   "experimental LLVM targets to build")

src/ci/docker/host-x86_64/i686-uefi/Dockerfile

@@ -0,0 +1,48 @@
+FROM ubuntu:22.04
+
+RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+      bc \
+      bzip2 \
+      ca-certificates \
+      cmake \
+      cpio \
+      curl \
+      file \
+      g++ \
+      git \
+      libc6-dev \
+      make \
+      ninja-build \
+      python3 \
+      qemu-system \
+      mtools \
+      gcc-multilib \
+      xz-utils
+
+ENV ARCH=i686
+
+# Create rootfs
+WORKDIR /tmp
+RUN mkdir rootfs
+
+# Copy over startup script
+COPY scripts/qemu_uefi.nsh rootfs/startup.nsh
+
+# OVMF Stuff
+RUN mkdir OVMF
+COPY OVMF/OVMF_CODE.fd OVMF/OVMF_CODE.fd
+COPY OVMF/OVMF_VARS.fd OVMF/OVMF_VARS.fd
+COPY OVMF/UefiShell.iso OVMF/UefiShell.iso
+
+# TODO: What is this?!
+# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
+RUN curl -O https://ci-mirrors.rust-lang.org/rustc/vexpress-v2p-ca15-tc1.dtb
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+ENV RUST_CONFIGURE_ARGS="${RUST_CONFIGURE_ARGS} --qemu-i686-uefi-rootfs=/tmp/rootfs --enable-lld --enable-ninja --set target.i686-unknown-uefi.linker=rust-lld"
+ENV RUST_TEST_THREADS=1
+ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target i686-unknown-uefi --warnings warn -v
+
+ENV NO_CHANGE_USER=1

src/ci/docker/host-x86_64/i686-uefi/OVMF/OVMF_CODE.fd

@@ -15,6 +15,7 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-
       ninja-build \
       python3 \
       qemu-system \
+      mtools \
       xz-utils
 
 ENV ARCH=x86_64
@@ -32,17 +33,15 @@ COPY OVMF/OVMF_CODE.fd OVMF/OVMF_CODE.fd
 COPY OVMF/OVMF_VARS.fd OVMF/OVMF_VARS.fd
 COPY OVMF/UefiShell.iso OVMF/UefiShell.iso
 
-# Config
-COPY host-x86_64/x86_64-uefi/config.toml config.toml
-
 # TODO: What is this?!
 # Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
 RUN curl -O https://ci-mirrors.rust-lang.org/rustc/vexpress-v2p-ca15-tc1.dtb
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS="${RUST_CONFIGURE_ARGS} --qemu-uefi-rootfs=/tmp/rootfs --enable-lld"
-ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target x86_64-unknown-uefi --warnings warn --config /tmp/config.toml -v
+ENV RUST_CONFIGURE_ARGS="${RUST_CONFIGURE_ARGS} --qemu-x86_64-uefi-rootfs=/tmp/rootfs --enable-lld --enable-ninja --set target.x86_64-unknown-uefi.linker=rust-lld"
+ENV RUST_TEST_THREADS=1
+ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target x86_64-unknown-uefi --warnings warn -v
 
 ENV NO_CHANGE_USER=1

src/ci/docker/host-x86_64/i686-uefi/OVMF/OVMF_VARS.fd

@@ -109,14 +109,47 @@ fn prepare_rootfs(target: &str, rootfs: &Path, server: &Path, rootfs_img: &Path)
     t!(fs::copy(server, rootfs.join("testd")));
 
     match target {
-        "arm-unknown-linux-gnueabihf" | "aarch64-unknown-linux-gnu" | "x86_64-unknown-uefi" => {
+        "arm-unknown-linux-gnueabihf" | "aarch64-unknown-linux-gnu" => {
             prepare_rootfs_cpio(rootfs, rootfs_img)
         }
+        "x86_64-unknown-uefi" | "i686-unknown-uefi" => prepare_rootfs_fat(rootfs, rootfs_img),
         "riscv64gc-unknown-linux-gnu" => prepare_rootfs_ext4(rootfs, rootfs_img),
         _ => panic!("{} is not supported", target),
     }
 }
 
+fn prepare_rootfs_fat(rootfs: &Path, rootfs_img: &Path) {
+    // println!("Rootfs: {}", rootfs.to_string_lossy());
+    // println!("Rootfs Img: {}", rootfs_img.to_string_lossy());
+    let mut dd = Command::new("dd");
+    dd.arg("if=/dev/zero")
+        .arg(&format!("of={}", rootfs_img.to_string_lossy()))
+        .arg("bs=1M")
+        .arg("count=1024");
+    let mut dd_child = t!(dd.spawn());
+    assert!(t!(dd_child.wait()).success());
+
+    let mut mformat = Command::new("mformat");
+    mformat.arg("-i").arg(rootfs_img).arg("::");
+    let mut mformat_child = t!(mformat.spawn());
+    assert!(t!(mformat_child.wait()).success());
+
+    let mut mcopy = Command::new("mcopy");
+    mcopy.arg("-i").arg(rootfs_img);
+    add_files(&mut mcopy, rootfs);
+    mcopy.arg("::");
+    let mut mcopy_child = t!(mcopy.spawn());
+    assert!(t!(mcopy_child.wait()).success());
+
+    fn add_files(cmd: &mut Command, cur: &Path) {
+        for entry in t!(cur.read_dir()) {
+            let entry = t!(entry);
+            let path = entry.path();
+            cmd.arg(path);
+        }
+    }
+}
+
 fn prepare_rootfs_cpio(rootfs: &Path, rootfs_img: &Path) {
     // Generate a new rootfs image now that we've updated the test server
     // executable. This is the equivalent of:
@@ -239,25 +272,51 @@ fn start_qemu_emulator(target: &str, rootfs: &Path, server: &Path, tmpdir: &Path
             let mut cmd = Command::new("qemu-system-x86_64");
             cmd.arg("-nographic")
                 .arg("-machine")
-                .arg("virt")
+                .arg("q35")
                 .arg("-m")
                 .arg("1024")
                 .arg("-drive")
-                .arg("if=pflash,format=raw,unit=0,file=/tmp/OVMF/OVMF_CODE.fd")
+                .arg("if=pflash,format=raw,file=/tmp/OVMF/OVMF_CODE.fd,index=0")
                 .arg("-drive")
-                .arg("if=pflash,format=raw,unit=1,file=/tmp/OVMF/OVMF_VARS.fd")
+                .arg("if=pflash,format=raw,file=/tmp/OVMF/OVMF_VARS.fd,index=1")
                 .arg("-drive")
-                .arg("format=raw,file=/tmp/OVMF/UefiShell.iso")
-                .arg("-append")
-                .arg("quiet console=ttyS0")
+                .arg("format=raw,file=/tmp/OVMF/UefiShell.iso,index=2")
                 .arg("-netdev")
                 .arg("user,id=net0,hostfwd=tcp::12345-:12345")
                 .arg("-device")
-                .arg("virtio-net-device,netdev=net0,mac=00:00:00:00:00:00")
+                .arg("virtio-net-pci,netdev=net0,mac=00:00:00:00:00:00")
                 .arg("-drive")
-                .arg(&format!("file={},format=raw,media=disk", &rootfs_img.to_string_lossy()));
+                .arg(&format!(
+                    "file={},format=raw,media=disk,index=3",
+                    &rootfs_img.to_string_lossy()
+                ));
             t!(cmd.spawn());
         }
+        "i686-unknown-uefi" => {
+            let mut cmd = Command::new("qemu-system-i386");
+            cmd.arg("-nographic")
+                .arg("-machine")
+                .arg("q35")
+                .arg("-m")
+                .arg("1024")
+                .arg("-drive")
+                .arg("if=pflash,format=raw,file=/tmp/OVMF/OVMF_CODE.fd,index=0")
+                .arg("-drive")
+                .arg("if=pflash,format=raw,file=/tmp/OVMF/OVMF_VARS.fd,index=1")
+                .arg("-drive")
+                .arg("format=raw,file=/tmp/OVMF/UefiShell.iso,index=2")
+                .arg("-netdev")
+                .arg("user,id=net0,hostfwd=tcp::12345-:12345")
+                .arg("-device")
+                .arg("virtio-net-pci,netdev=net0,mac=00:00:00:00:00:00")
+                .arg("-drive")
+                .arg(&format!(
+                    "file={},format=raw,media=disk,index=3",
+                    &rootfs_img.to_string_lossy()
+                ));
+            t!(cmd.spawn());
+        }
+
         _ => panic!("cannot start emulator for: {}", target),
     }
 }