From 9235ae56c282d5a02ada3ed9b4e0fe2ee5738bde Mon Sep 17 00:00:00 2001 From: Nikos Nikoleris Date: Fri, 13 Sep 2019 18:23:33 +0100 Subject: cpu: Fix checker cpu instantiation This change uses the params as instantiated from the default constructor to create the checker cpu. If any of these parameters are invalid for the checker cpu, the simulation will exit with a warning. Change-Id: I0e58ed096c9ea5f413f2e9b64d8d184d9b0fc84e Signed-off-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21079 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/cpu/o3/checker.cc | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) (limited to 'src/cpu/o3') diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc index 16c5a8704..1713da7c1 100644 --- a/src/cpu/o3/checker.cc +++ b/src/cpu/o3/checker.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 ARM Limited + * Copyright (c) 2011, 2019 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -48,45 +48,15 @@ template class Checker; -//////////////////////////////////////////////////////////////////////// -// -// CheckerCPU Simulation Object -// O3Checker * O3CheckerParams::create() { - O3Checker::Params *params = new O3Checker::Params(); - params->name = name; - params->numThreads = numThreads; - params->max_insts_any_thread = 0; - params->max_insts_all_threads = 0; - params->max_loads_any_thread = 0; - params->max_loads_all_threads = 0; - params->exitOnError = exitOnError; - params->updateOnError = updateOnError; - params->warnOnlyOnLoadError = warnOnlyOnLoadError; - params->clk_domain = clk_domain; - params->tracer = tracer; - // Hack to touch all parameters. Consider not deriving Checker - // from BaseCPU..it's not really a CPU in the end. - Counter temp; - temp = max_insts_any_thread; - temp = max_insts_all_threads; - temp = max_loads_any_thread; - temp = max_loads_all_threads; - temp++; - Tick temp2 = progress_interval; - params->progress_interval = 0; - temp2++; + // The checker should check all instructions executed by the main + // cpu and therefore any parameters for early exit don't make much + // sense. + fatal_if(max_insts_any_thread || max_insts_all_threads || + max_loads_any_thread || max_loads_all_threads || + progress_interval, "Invalid checker parameters"); - params->itb = itb; - params->dtb = dtb; - params->isa = isa; - params->system = system; - params->cpu_id = cpu_id; - params->profile = profile; - params->workload = workload; - - O3Checker *cpu = new O3Checker(params); - return cpu; + return new O3Checker(this); } -- cgit v1.2.3