-
Notifications
You must be signed in to change notification settings - Fork 56
resources: Add files to make 6.8.12 riscv kernel and gem5 bridge driver #67
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: stable
Are you sure you want to change the base?
Changes from 6 commits
977630e
dd7cf0a
72ea968
0a1b8e9
c21bcea
91eb056
cfb8735
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright (c) 2024 The Regents of the University of California. | ||
| # SPDX-License-Identifier: BSD 3-Clause | ||
|
|
||
| PACKER_VERSION="1.10.0" | ||
|
|
||
| if [ ! -f ./packer ]; then | ||
| wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip; | ||
| unzip packer_${PACKER_VERSION}_linux_amd64.zip; | ||
| rm packer_${PACKER_VERSION}_linux_amd64.zip; | ||
| fi | ||
|
|
||
| if [ ! -f riscv-ubuntu-24.04-20250515 ]; then | ||
| wget https://dist.gem5.org/dist/develop/images/riscv/ubuntu-24-04/riscv-ubuntu-24.04-20250515.gz | ||
| gunzip riscv-ubuntu-24.04-20250515.gz; | ||
| fi | ||
|
|
||
| ./packer init riscv-npb.pkr.hcl | ||
| ./packer build riscv-npb.pkr.hcl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| #--------------------------------------------------------------------------- | ||
| # | ||
| # SITE- AND/OR PLATFORM-SPECIFIC DEFINITIONS. | ||
| # | ||
| #--------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # This config is specific for gem5. | ||
| #--------------------------------------------------------------------------- | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Items in this file will need to be changed for each platform. | ||
| #--------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Parallel Fortran: | ||
| # | ||
| # For CG, EP, FT, MG, LU, SP, BT and UA, which are in Fortran, the following | ||
| # must be defined: | ||
| # | ||
| # FC - Fortran compiler | ||
| # FFLAGS - Fortran compilation arguments | ||
| # F_INC - any -I arguments required for compiling Fortran | ||
| # FLINK - Fortran linker | ||
| # FLINKFLAGS - Fortran linker arguments | ||
| # F_LIB - any -L and -l arguments required for linking Fortran | ||
| # | ||
| # compilations are done with $(FC) $(F_INC) $(FFLAGS) or | ||
| # $(FC) $(FFLAGS) | ||
| # linking is done with $(FLINK) $(F_LIB) $(FLINKFLAGS) | ||
| #--------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # This is the fortran compiler used for Fortran programs | ||
| #--------------------------------------------------------------------------- | ||
| FC = gfortran | ||
| # This links fortran programs; usually the same as ${FC} | ||
| FLINK = $(FC) | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # These macros are passed to the linker | ||
| #--------------------------------------------------------------------------- | ||
| F_LIB = -lm5 -lm | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # These macros are passed to the compiler | ||
| #--------------------------------------------------------------------------- | ||
| F_INC = | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Global *compile time* flags for Fortran programs | ||
| #--------------------------------------------------------------------------- | ||
| FFLAGS = -O3 -fopenmp -cpp -mcmodel=medany -fcommon -no-pie -DM5_ANNOTATION | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Global *link time* flags. Flags for increasing maximum executable | ||
| # size usually go here. | ||
| #--------------------------------------------------------------------------- | ||
| # Using no-pie here as m5 is compiled with the no-pie flash and cant no be build | ||
| # as a position independent executable. | ||
| FLINKFLAGS = -O3 -fopenmp -no-pie | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Parallel C: | ||
| # | ||
| # For IS and DC, which are in C, the following must be defined: | ||
| # | ||
| # CC - C compiler | ||
| # CFLAGS - C compilation arguments | ||
| # C_INC - any -I arguments required for compiling C | ||
| # CLINK - C linker | ||
| # CLINKFLAGS - C linker flags | ||
| # C_LIB - any -L and -l arguments required for linking C | ||
| # | ||
| # compilations are done with $(CC) $(C_INC) $(CFLAGS) or | ||
| # $(CC) $(CFLAGS) | ||
| # linking is done with $(CLINK) $(C_LIB) $(CLINKFLAGS) | ||
| #--------------------------------------------------------------------------- | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # This is the C compiler used for C programs | ||
| #--------------------------------------------------------------------------- | ||
| CC = gcc | ||
| # This links C programs; usually the same as ${CC} | ||
| CLINK = $(CC) | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # These macros are passed to the linker | ||
| #--------------------------------------------------------------------------- | ||
| C_LIB = -lm5 -lm | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # These macros are passed to the compiler | ||
| #--------------------------------------------------------------------------- | ||
| C_INC = | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Global *compile time* flags for C programs | ||
| # DC inspects the following flags (preceded by "-D"): | ||
| # | ||
| # IN_CORE - computes all views and checksums in main memory (if there is | ||
| # enough memory) | ||
| # | ||
| # VIEW_FILE_OUTPUT - forces DC to write the generated views to disk | ||
| # | ||
| # OPTIMIZATION - turns on some nonstandard DC optimizations | ||
| # | ||
| # _FILE_OFFSET_BITS=64 | ||
| # _LARGEFILE64_SOURCE - are standard compiler flags which allow to work with | ||
| # files larger than 2GB. | ||
| #--------------------------------------------------------------------------- | ||
| CFLAGS = -O3 -fopenmp -mcmodel=medany -fcommon -no-pie -DM5_ANNOTATION | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Global *link time* flags. Flags for increasing maximum executable | ||
| # size usually go here. | ||
| #--------------------------------------------------------------------------- | ||
| # Using no-pie here as m5 is compiled with the no-pie flash and cant no be build | ||
| # as a position independent executable. | ||
| CLINKFLAGS = -O3 -fopenmp -no-pie | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Utilities C: | ||
| # | ||
| # This is the C compiler used to compile C utilities. Flags required by | ||
| # this compiler go here also; typically there are few flags required; hence | ||
| # there are no separate macros provided for such flags. | ||
| #--------------------------------------------------------------------------- | ||
| UCC = gcc | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Destination of executables, relative to subdirs of the main directory. . | ||
| #--------------------------------------------------------------------------- | ||
| BINDIR = ../bin | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # The variable RAND controls which random number generator | ||
| # is used. It is described in detail in README.install. | ||
| # Use "randi8" unless there is a reason to use another one. | ||
| # Other allowed values are "randi8_safe", "randdp" and "randdpvec" | ||
| #--------------------------------------------------------------------------- | ||
| RAND = randi8 | ||
| # The following is highly reliable but may be slow: | ||
| # RAND = randdp | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # The variable WTIME is the name of the wtime source code module in the | ||
| # common directory. | ||
| # For most machines, use wtime.c | ||
| # For SGI power challenge: use wtime_sgi64.c | ||
| #--------------------------------------------------------------------------- | ||
| WTIME = wtime.c | ||
|
|
||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Enable if either Cray (not Cray-X1) or IBM: | ||
| # (no such flag for most machines: see common/wtime.h) | ||
| # This is used by the C compiler to pass the machine name to common/wtime.h, | ||
| # where the C/Fortran binding interface format is determined | ||
| #--------------------------------------------------------------------------- | ||
| # MACHINE = -DCRAY | ||
| # MACHINE = -DIBM |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| Copyright (c) 2024 The Regents of the University of California | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are | ||
| met: redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer; | ||
| redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution; | ||
| neither the name of the copyright holders nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| #include <stdio.h> | ||
| #include <gem5/m5ops.h> | ||
|
|
||
|
|
||
| void init_() __attribute__((constructor)); | ||
| void map_m5_mem(); | ||
|
|
||
| void init_() { | ||
|
|
||
| //__attribute__ makes this function get called before main() | ||
| // need to mmap /dev/mem | ||
| printf(" --------------------- M5 INIT --------------------- \n"); | ||
| map_m5_mem(); | ||
| } | ||
|
|
||
| void m5_exit_interface_() | ||
| { | ||
| printf(" --------------------- M5 EXIT --------------------- \n"); | ||
| // this function calls m5_exit | ||
| m5_exit(0); | ||
| } | ||
|
|
||
| void m5_work_begin_interface_() | ||
| { | ||
|
|
||
| printf(" -------------------- ROI BEGIN -------------------- \n"); | ||
| m5_hypercall(4); | ||
| } | ||
|
|
||
| void m5_work_end_interface_() | ||
| { | ||
| m5_hypercall(5); | ||
| printf(" -------------------- ROI END -------------------- \n"); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| packer { | ||
| required_plugins { | ||
| qemu = { | ||
| source = "github.com/hashicorp/qemu" | ||
| version = "~> 1" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| variable "image_name" { | ||
| type = string | ||
| default = "riscv-ubuntu-npb-24.04" | ||
| } | ||
|
|
||
| variable "ssh_password" { | ||
| type = string | ||
| default = "12345" | ||
| } | ||
|
|
||
| variable "ssh_username" { | ||
| type = string | ||
| default = "gem5" | ||
| } | ||
|
|
||
| source "qemu" "initialize" { | ||
| cpus = "4" | ||
| disk_size = "5000" | ||
| format = "raw" | ||
| headless = "true" | ||
| disk_image = "true" | ||
| boot_command = ["<wait90>", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to add documentation in README.md or BUILDING.md about how users can/might need to adjust the wait times to avoid timing issues when building the disk image on their own systems. It would also be nice to have a comment in the Packer file. |
||
| "gem5<enter><wait2>", | ||
| "12345<enter><wait2>", | ||
| "sudo mount -o remount,rw /<enter><wait2>", // remounting system as read-write as qemu does not like that we have m5 exits in the boot process so it mounts system as read ony. | ||
| "12345<enter><wait2>", | ||
| "sudo mv /etc/netplan/50-cloud-init.yaml.bak /etc/netplan/50-cloud-init.yaml<enter><wait2>", | ||
| "sudo netplan apply<enter><wait2>", | ||
| "<wait>" | ||
| ] | ||
| iso_checksum = "sha256:ddf1ebb56454ef37e88d6de8aefdef7180fc9a2328a3bf8cff02f7a043e7127b" | ||
| iso_urls = ["./riscv-ubuntu-24.04-20250515"] | ||
| memory = "8192" | ||
| output_directory = "riscv-disk-image-ubuntu-24-04" | ||
| qemu_binary = "/usr/bin/qemu-system-riscv64" | ||
|
|
||
| qemuargs = [ ["-bios", "/usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.elf"], | ||
| ["-machine", "virt"], | ||
| ["-kernel","/usr/lib/u-boot/qemu-riscv64_smode/uboot.elf"], | ||
| ["-device", "virtio-vga"], | ||
| ["-device", "qemu-xhci"], | ||
| ["-device", "usb-kbd"] | ||
| ] | ||
| shutdown_command = "echo '${var.ssh_password}'|sudo -S shutdown -P now" | ||
| ssh_password = "${var.ssh_password}" | ||
| ssh_username = "${var.ssh_username}" | ||
| ssh_wait_timeout = "60m" | ||
| vm_name = "${var.image_name}" | ||
| ssh_handshake_attempts = "1000" | ||
| } | ||
|
|
||
| build { | ||
| sources = ["source.qemu.initialize"] | ||
| provisioner "file" { | ||
| source = "npb-with-roi/NPB/NPB3.4-OMP" | ||
| destination = "/home/gem5/" | ||
| } | ||
|
|
||
| provisioner "file" { | ||
| source = "makefiles/riscv/make.def" | ||
| destination = "/home/gem5/NPB3.4-OMP/config/" | ||
| } | ||
|
|
||
| provisioner "file" { | ||
| source = "npb-hook-files/non-addr-version/hooks.c" | ||
| destination = "/home/gem5/NPB3.4-OMP/common/" | ||
| } | ||
|
|
||
| provisioner "shell" { | ||
| execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'" | ||
| scripts = ["scripts/post-installation.sh"] | ||
| } | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment as above; was this change supposed to be in this PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this change supposed to be in this PR? It's a change for Arm NPB, but the PR is for RISCV.