[gem5-dev] Change in gem5/gem5[develop]: configs: Use workloads.py in baremetal.py

2020-04-23 Thread Giacomo Travaglini (Gerrit) via gem5-dev
Giacomo Travaglini has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/27971 )


Change subject: configs: Use workloads.py in baremetal.py
..

configs: Use workloads.py in baremetal.py

Change-Id: I806b771df448241a7a61f496ac22c29d5bc6b84c
Signed-off-by: Giacomo Travaglini 
Reviewed-by: Nikos Nikoleris 
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27971
Reviewed-by: Daniel Carvalho 
Tested-by: kokoro 
---
M configs/example/arm/baremetal.py
1 file changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Daniel Carvalho: Looks good to me, approved
  Giacomo Travaglini: Looks good to me, approved
  kokoro: Regressions pass



diff --git a/configs/example/arm/baremetal.py  
b/configs/example/arm/baremetal.py

index 00a350a..24f40ec 100644
--- a/configs/example/arm/baremetal.py
+++ b/configs/example/arm/baremetal.py
@@ -57,6 +57,7 @@
 from common.cores.arm import HPI

 import devices
+import workloads

 # Pre-defined CPU configurations. Each tuple must be ordered as :  
(cpu_class,
 # l1_icache_class, l1_dcache_class, walk_cache_class, l2_Cache_class). Any  
of

@@ -100,9 +101,6 @@
   args.mem_size,
   platform=platform(),
   mem_mode=mem_mode,
-  workload=ArmFsWorkload(
-  atags_addr=0,
-  object_file=args.kernel),
   readfile=args.readfile)

 MemConfig.config_mem(args, system)
@@ -162,6 +160,10 @@
 system.have_virtualization = True
 system.have_security = True

+workload_class = workloads.workload_list.get(args.workload)
+system.workload = workload_class(
+args.kernel, system)
+
 return system

 def run(args):
@@ -190,6 +192,10 @@
 parser.add_argument("--kernel", type=str,
 default=None,
 help="Binary to run")
+parser.add_argument("--workload", type=str,
+default="ArmBaremetal",
+choices=workloads.workload_list.get_names(),
+help="Workload type")
 parser.add_argument("--disk-image", type=str,
 default=None,
 help="Disk to instantiate")

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


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I806b771df448241a7a61f496ac22c29d5bc6b84c
Gerrit-Change-Number: 27971
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini 
Gerrit-Reviewer: Ciro Santilli 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Giacomo Travaglini 
Gerrit-Reviewer: Nikos Nikoleris 
Gerrit-Reviewer: kokoro 
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s


[gem5-dev] Change in gem5/gem5[develop]: configs: Use workloads.py in baremetal.py

2020-04-21 Thread Giacomo Travaglini (Gerrit)

Hello Nikos Nikoleris,

I'd like you to do a code review. Please visit

https://gem5-review.googlesource.com/c/public/gem5/+/27971

to review the following change.


Change subject: configs: Use workloads.py in baremetal.py
..

configs: Use workloads.py in baremetal.py

Change-Id: I806b771df448241a7a61f496ac22c29d5bc6b84c
Signed-off-by: Giacomo Travaglini 
Reviewed-by: Nikos Nikoleris 
---
M configs/example/arm/baremetal.py
1 file changed, 9 insertions(+), 3 deletions(-)



diff --git a/configs/example/arm/baremetal.py  
b/configs/example/arm/baremetal.py

index 00a350a..00fe5e7 100644
--- a/configs/example/arm/baremetal.py
+++ b/configs/example/arm/baremetal.py
@@ -57,6 +57,7 @@
 from common.cores.arm import HPI

 import devices
+import workloads

 # Pre-defined CPU configurations. Each tuple must be ordered as :  
(cpu_class,
 # l1_icache_class, l1_dcache_class, walk_cache_class, l2_Cache_class). Any  
of

@@ -100,9 +101,6 @@
   args.mem_size,
   platform=platform(),
   mem_mode=mem_mode,
-  workload=ArmFsWorkload(
-  atags_addr=0,
-  object_file=args.kernel),
   readfile=args.readfile)

 MemConfig.config_mem(args, system)
@@ -162,6 +160,10 @@
 system.have_virtualization = True
 system.have_security = True

+workload_class = getattr(workloads, args.workload)
+system.workload = workload_class(
+args.kernel, system)
+
 return system

 def run(args):
@@ -190,6 +192,10 @@
 parser.add_argument("--kernel", type=str,
 default=None,
 help="Binary to run")
+parser.add_argument("--workload", type=str,
+default="ArmBaremetal",
+choices=workloads.workload_types.keys(),
+help="Workload type")
 parser.add_argument("--disk-image", type=str,
 default=None,
 help="Disk to instantiate")

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


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I806b771df448241a7a61f496ac22c29d5bc6b84c
Gerrit-Change-Number: 27971
Gerrit-PatchSet: 1
Gerrit-Owner: Giacomo Travaglini 
Gerrit-Reviewer: Nikos Nikoleris 
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev