From 2b103231ea6d88755da1ac53fd50887998267aef Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 3 Dec 2019 20:33:28 -0800 Subject: [PATCH] config: Default the indirect branch predictor to "None". Other scripts (like se.py) blindly try to apply the indirect predictor if one is set. Because this option defaults to something, there's no way (as far as I know) to purposefully select nothing, and so the simulator crashes. Users shouldn't have to proactively prevent gem5 from killing itself regardless, so the default was changed to "None". Change-Id: Ic3382b8065442d6705b1c6a656646598d9d5c322 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23360 Reviewed-by: Ciro Santilli Reviewed-by: Giacomo Travaglini Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- configs/common/Options.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/common/Options.py b/configs/common/Options.py index 71d22a461..173bd483c 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -183,8 +183,7 @@ def addCommonOptions(parser): type of branch predictor to run with (if not set, use the default branch predictor of the selected CPU)""") - parser.add_option("--indirect-bp-type", type="choice", - default="SimpleIndirectPredictor", + parser.add_option("--indirect-bp-type", type="choice", default=None, choices=ObjectList.indirect_bp_list.get_names(), help = "type of indirect branch predictor to run with") parser.add_option("--list-hwp-types", -- 2.30.2