[gem5-dev] [XS] Change in gem5/gem5[develop]: configs: Add GPUFS --root-partition option

2023-06-29 Thread Matthew Poremba (Gerrit) via gem5-dev
Matthew Poremba has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71918?usp=email )


Change subject: configs: Add GPUFS --root-partition option
..

configs: Add GPUFS --root-partition option

Different GPUFS disk images have different root partitions that Linux
needs to boot from. In particular, Ubuntu's new installer has a GRUB
partition that cannot seem to be removed. Adding this as an option
prevents needing to edit a config script to change one character each
time a different disk image is used.

Change-Id: Iac2996ea096047281891a70aa2901401ac9746fc
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71918
Tested-by: kokoro 
Reviewed-by: Matt Sinclair 
Maintainer: Matt Sinclair 
---
M configs/example/gpufs/runfs.py
M configs/example/gpufs/system/system.py
2 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  kokoro: Regressions pass
  Matt Sinclair: Looks good to me, approved; Looks good to me, approved




diff --git a/configs/example/gpufs/runfs.py b/configs/example/gpufs/runfs.py
index b045b80..5346622 100644
--- a/configs/example/gpufs/runfs.py
+++ b/configs/example/gpufs/runfs.py
@@ -151,6 +151,13 @@
 help="Exit simulation after running this many kernels",
 )

+parser.add_argument(
+"--root-partition",
+type=str,
+default="/dev/sda1",
+help="Root partition of disk image",
+)
+

 def runGpuFSSystem(args):
 """
diff --git a/configs/example/gpufs/system/system.py  
b/configs/example/gpufs/system/system.py

index 263ffc0..40e0016 100644
--- a/configs/example/gpufs/system/system.py
+++ b/configs/example/gpufs/system/system.py
@@ -50,7 +50,7 @@
 "earlyprintk=ttyS0",
 "console=ttyS0,9600",
 "lpj=723",
-"root=/dev/sda1",
+f"root={args.root_partition}",
 "drm_kms_helper.fbdev_emulation=0",
 "modprobe.blacklist=amdgpu",
 "modprobe.blacklist=psmouse",

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/71918?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings?usp=email


Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Iac2996ea096047281891a70aa2901401ac9746fc
Gerrit-Change-Number: 71918
Gerrit-PatchSet: 2
Gerrit-Owner: Matthew Poremba 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Matt Sinclair 
Gerrit-Reviewer: Matthew Poremba 
Gerrit-Reviewer: kokoro 
Gerrit-CC: kokoro 
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org


[gem5-dev] [XS] Change in gem5/gem5[develop]: configs: Add GPUFS --root-partition option

2023-06-29 Thread Matthew Poremba (Gerrit) via gem5-dev
Matthew Poremba has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71918?usp=email )



Change subject: configs: Add GPUFS --root-partition option
..

configs: Add GPUFS --root-partition option

Different GPUFS disk images have different root partitions that Linux
needs to boot from. In particular, Ubuntu's new installer has a GRUB
partition that cannot seem to be removed. Adding this as an option
prevents needing to edit a config script to change one character each
time a different disk image is used.

Change-Id: Iac2996ea096047281891a70aa2901401ac9746fc
---
M configs/example/gpufs/runfs.py
M configs/example/gpufs/system/system.py
2 files changed, 8 insertions(+), 1 deletion(-)



diff --git a/configs/example/gpufs/runfs.py b/configs/example/gpufs/runfs.py
index b045b80..5346622 100644
--- a/configs/example/gpufs/runfs.py
+++ b/configs/example/gpufs/runfs.py
@@ -151,6 +151,13 @@
 help="Exit simulation after running this many kernels",
 )

+parser.add_argument(
+"--root-partition",
+type=str,
+default="/dev/sda1",
+help="Root partition of disk image",
+)
+

 def runGpuFSSystem(args):
 """
diff --git a/configs/example/gpufs/system/system.py  
b/configs/example/gpufs/system/system.py

index 263ffc0..40e0016 100644
--- a/configs/example/gpufs/system/system.py
+++ b/configs/example/gpufs/system/system.py
@@ -50,7 +50,7 @@
 "earlyprintk=ttyS0",
 "console=ttyS0,9600",
 "lpj=723",
-"root=/dev/sda1",
+f"root={args.root_partition}",
 "drm_kms_helper.fbdev_emulation=0",
 "modprobe.blacklist=amdgpu",
 "modprobe.blacklist=psmouse",

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/71918?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings?usp=email


Gerrit-MessageType: newchange
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Iac2996ea096047281891a70aa2901401ac9746fc
Gerrit-Change-Number: 71918
Gerrit-PatchSet: 1
Gerrit-Owner: Matthew Poremba 
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org