resources,stdlib: Add workload to resource specialization and deprecate workload.py (#212)

This commit is contained in:
Bobby R. Bruce
2023-09-07 12:45:45 -07:00
committed by GitHub
15 changed files with 158 additions and 227 deletions

View File

@@ -40,7 +40,7 @@ from gem5.components.processors.cpu_types import CPUTypes
from gem5.components.boards.riscv_board import RiscvBoard
from gem5.components.processors.simple_processor import SimpleProcessor
from gem5.simulate.simulator import Simulator
from gem5.resources.workload import Workload
from gem5.resources.resource import obtain_resource
import argparse
import importlib
@@ -160,7 +160,7 @@ board = RiscvBoard(
)
# Set the workload.
workload = Workload(
workload = obtain_resource(
"riscv-ubuntu-20.04-boot", resource_directory=args.resource_directory
)
board.set_workload(workload)

View File

@@ -41,7 +41,7 @@ from gem5.components.processors.cpu_types import (
)
from gem5.components.processors.simple_processor import SimpleProcessor
from gem5.simulate.simulator import Simulator
from gem5.resources.workload import Workload
from gem5.resources.resource import obtain_resource
import argparse
import importlib
@@ -184,7 +184,7 @@ if args.boot_type == "init":
kernal_args.append("init=/root/exit.sh")
# Set the workload.
workload = Workload(
workload = obtain_resource(
"x86-ubuntu-18.04-boot", resource_directory=args.resource_directory
)
workload.set_parameter("kernel_args", kernal_args)

View File

@@ -32,6 +32,7 @@ from gem5.resources.resource import (
BinaryResource,
DiskImageResource,
obtain_resource,
WorkloadResource,
)
from typing import Dict
@@ -61,7 +62,7 @@ class CustomWorkloadTestSuite(unittest.TestCase):
new=ClientWrapper(mock_config_json),
)
def setUpClass(cls) -> None:
cls.custom_workload = CustomWorkload(
cls.custom_workload = WorkloadResource(
function="set_se_binary_workload",
parameters={
"binary": obtain_resource(
@@ -135,7 +136,7 @@ class WorkloadTestSuite(unittest.TestCase):
ClientWrapper(mock_config_json),
)
def setUpClass(cls):
cls.workload = Workload("simple-boot", gem5_version="develop")
cls.workload = obtain_resource("simple-boot", gem5_version="develop")
def test_get_function_str(self) -> None:
# Tests `Resource.get_function_str`