From a2f8d70342e9b8b2fdea88356279fdcf5ef24857 Mon Sep 17 00:00:00 2001 From: Rose Thompson Date: Sun, 4 Feb 2024 16:53:47 -0600 Subject: [PATCH] Updated branch predictor derivative configs. --- config/derivlist.txt | 27 ++++++++++--------- sim/bp-results/branch-list.txt | 24 ++++++++--------- sim/bp-results/btb-list.txt | 12 ++++----- sim/bp-results/class-list.txt | 12 ++++----- sim/bp-results/ras-list.txt | 10 +++---- sim/regression-wally | 48 ++++++++++++++++++---------------- 6 files changed, 70 insertions(+), 63 deletions(-) diff --git a/config/derivlist.txt b/config/derivlist.txt index 558cedbe3..242c803a5 100644 --- a/config/derivlist.txt +++ b/config/derivlist.txt @@ -285,27 +285,30 @@ RAS_SIZE 32'd4 deriv bpred_GSHARE_10_6_10_1_rv32gc rv32gc RAS_SIZE 32'd6 -deriv bpred_GSHARE_10_2_10_1_rv32gc rv32gc +deriv bpred_GSHARE_10_10_10_1_rv32gc rv32gc RAS_SIZE 32'd10 deriv bpred_GSHARE_10_16_10_1_rv32gc rv32gc RAS_SIZE 32'd16 -deriv bpred_GSHARE_10_2_6_1_rv32gc rv32gc +deriv bpred_GSHARE_10_16_6_1_rv32gc rv32gc BTB_SIZE 32'd6 -deriv bpred_GSHARE_10_2_8_1_rv32gc rv32gc +deriv bpred_GSHARE_10_16_8_1_rv32gc rv32gc BTB_SIZE 32'd8 -deriv bpred_GSHARE_10_2_12_1_rv32gc rv32gc +deriv bpred_GSHARE_10_16_12_1_rv32gc rv32gc BTB_SIZE 32'd12 -deriv bpred_GSHARE_10_2_14_1_rv32gc rv32gc +deriv bpred_GSHARE_10_16_14_1_rv32gc rv32gc BTB_SIZE 32'd14 -deriv bpred_GSHARE_10_2_16_1_rv32gc rv32gc +deriv bpred_GSHARE_10_16_16_1_rv32gc rv32gc BTB_SIZE 32'd16 + + + deriv bpred_GSHARE_6_16_10_0_rv32gc rv32gc bpred_GSHARE_6_16_10_1_rv32gc INSTR_CLASS_PRED 0 @@ -354,25 +357,25 @@ INSTR_CLASS_PRED 0 deriv bpred_GSHARE_10_6_10_0_rv32gc rv32gc bpred_GSHARE_10_6_10_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_10_0_rv32gc rv32gc bpred_GSHARE_10_2_10_1_rv32gc +deriv bpred_GSHARE_10_10_10_0_rv32gc rv32gc bpred_GSHARE_10_10_10_1_rv32gc INSTR_CLASS_PRED 0 deriv bpred_GSHARE_10_16_10_0_rv32gc rv32gc bpred_GSHARE_10_16_10_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_6_0_rv32gc rv32gc bpred_GSHARE_10_2_6_1_rv32gc +deriv bpred_GSHARE_10_16_6_0_rv32gc rv32gc bpred_GSHARE_10_16_6_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_8_0_rv32gc rv32gc bpred_GSHARE_10_2_8_1_rv32gc +deriv bpred_GSHARE_10_16_8_0_rv32gc rv32gc bpred_GSHARE_10_16_8_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_12_0_rv32gc rv32gc bpred_GSHARE_10_2_12_1_rv32gc +deriv bpred_GSHARE_10_16_12_0_rv32gc rv32gc bpred_GSHARE_10_16_12_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_14_0_rv32gc rv32gc bpred_GSHARE_10_2_14_1_rv32gc +deriv bpred_GSHARE_10_16_14_0_rv32gc rv32gc bpred_GSHARE_10_16_14_1_rv32gc INSTR_CLASS_PRED 0 -deriv bpred_GSHARE_10_2_16_0_rv32gc rv32gc bpred_GSHARE_10_2_16_1_rv32gc +deriv bpred_GSHARE_10_16_16_0_rv32gc rv32gc bpred_GSHARE_10_16_16_1_rv32gc INSTR_CLASS_PRED 0 # Cache configurations diff --git a/sim/bp-results/branch-list.txt b/sim/bp-results/branch-list.txt index 956fc9847..10827b3b9 100644 --- a/sim/bp-results/branch-list.txt +++ b/sim/bp-results/branch-list.txt @@ -1,12 +1,12 @@ -../logs/rv32gc_gshare6.log gshare 6 -../logs/rv32gc_gshare8.log gshare 8 -../logs/rv32gc_gshare10.log gshare 10 -../logs/rv32gc_gshare12.log gshare 12 -../logs/rv32gc_gshare14.log gshare 14 -../logs/rv32gc_gshare16.log gshare 16 -../logs/rv32gc_twobit6.log twobit 6 -../logs/rv32gc_twobit8.log twobit 8 -../logs/rv32gc_twobit10.log twobit 10 -../logs/rv32gc_twobit12.log twobit 12 -../logs/rv32gc_twobit14.log twobit 14 -../logs/rv32gc_twobit16.log twobit 16 +../logs/bpred_GSHARE_6_16_10_0_rv32gc_embench.log gshare 6 +../logs/bpred_GSHARE_8_16_10_0_rv32gc_embench.log gshare 8 +../logs/bpred_GSHARE_10_16_10_0_rv32gc_embench.log gshare 10 +../logs/bpred_GSHARE_12_16_10_0_rv32gc_embench.log gshare 12 +../logs/bpred_GSHARE_14_16_10_0_rv32gc_embench.log gshare 14 +../logs/bpred_GSHARE_16_16_10_0_rv32gc_embench.log gshare 16 +../logs/bpred_TWOBIT_6_16_10_0_rv32gc_embench.log twobit 6 +../logs/bpred_TWOBIT_8_16_10_0_rv32gc_embench.log twobit 8 +../logs/bpred_TWOBIT_10_16_10_0_rv32gc_embench.log twobit 10 +../logs/bpred_TWOBIT_12_16_10_0_rv32gc_embench.log twobit 12 +../logs/bpred_TWOBIT_14_16_10_0_rv32gc_embench.log twobit 14 +../logs/bpred_TWOBIT_16_16_10_0_rv32gc_embench.log twobit 16 diff --git a/sim/bp-results/btb-list.txt b/sim/bp-results/btb-list.txt index 30811459e..a4671ba9f 100644 --- a/sim/bp-results/btb-list.txt +++ b/sim/bp-results/btb-list.txt @@ -1,6 +1,6 @@ -../logs/rv32gc_BTB6.log btb 6 -../logs/rv32gc_BTB8.log btb 8 -../logs/rv32gc_BTB10.log btb 10 -../logs/rv32gc_BTB12.log btb 12 -../logs/rv32gc_BTB14.log btb 14 -../logs/rv32gc_BTB16.log btb 16 +../logs/bpred_GSHARE_16_16_6_0_rv32gc_embench.log btb 6 +../logs/bpred_GSHARE_16_16_8_0_rv32gc_embench.log btb 8 +../logs/bpred_GSHARE_16_16_10_0_rv32gc_embench.log btb 10 +../logs/bpred_GSHARE_16_16_12_0_rv32gc_embench.log btb 12 +../logs/bpred_GSHARE_16_16_14_0_rv32gc_embench.log btb 14 +../logs/bpred_GSHARE_16_16_16_0_rv32gc_embench.log btb 16 diff --git a/sim/bp-results/class-list.txt b/sim/bp-results/class-list.txt index 3926af969..0be63e91a 100644 --- a/sim/bp-results/class-list.txt +++ b/sim/bp-results/class-list.txt @@ -1,6 +1,6 @@ -../logs/rv32gc_class6.log class 6 -../logs/rv32gc_class8.log class 8 -../logs/rv32gc_class10.log class 10 -../logs/rv32gc_class12.log class 12 -../logs/rv32gc_class14.log class 14 -../logs/rv32gc_class16.log class 16 +../logs/bpred_GSHARE_16_16_6_1_rv32gc_embench.log btb 6 +../logs/bpred_GSHARE_16_16_8_1_rv32gc_embench.log btb 8 +../logs/bpred_GSHARE_16_16_10_1_rv32gc_embench.log btb 10 +../logs/bpred_GSHARE_16_16_12_1_rv32gc_embench.log btb 12 +../logs/bpred_GSHARE_16_16_14_1_rv32gc_embench.log btb 14 +../logs/bpred_GSHARE_16_16_16_1_rv32gc_embench.log btb 16 diff --git a/sim/bp-results/ras-list.txt b/sim/bp-results/ras-list.txt index c7628ffaa..c9246b14d 100644 --- a/sim/bp-results/ras-list.txt +++ b/sim/bp-results/ras-list.txt @@ -1,5 +1,5 @@ -../logs/rv32gc_RAS3.log ras 3 -../logs/rv32gc_RAS4.log ras 4 -../logs/rv32gc_RAS6.log ras 6 -../logs/rv32gc_RAS10.log ras 10 -../logs/rv32gc_RAS16.log ras 16 +../logs/bpred_GSHARE_10_3_10_0_rv32gc_embench.log ras 3 +../logs/bpred_GSHARE_10_4_10_0_rv32gc_embench.log ras 4 +../logs/bpred_GSHARE_10_6_10_0_rv32gc_embench.log ras 6 +../logs/bpred_GSHARE_10_10_10_0_rv32gc_embench.log ras 10 +../logs/bpred_GSHARE_10_16_10_0_rv32gc_embench.log ras 16 diff --git a/sim/regression-wally b/sim/regression-wally index c0e84a8a1..4c3b630c4 100755 --- a/sim/regression-wally +++ b/sim/regression-wally @@ -232,36 +232,40 @@ if (nightly): ["bpred_TWOBIT_12_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_TWOBIT_14_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_TWOBIT_16_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + + ["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_10_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_10_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_12_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_12_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_14_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_14_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_16_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_16_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_6_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_6_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_8_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_2_8_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_12_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_12_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_14_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_14_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_16_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], ["bpred_GSHARE_16_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], - ["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + + # btb + ["bpred_GSHARE_10_16_6_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_16_6_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_16_8_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_16_8_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_16_12_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_16_12_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + + # ras + ["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_10_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + ["bpred_GSHARE_10_10_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"], + # enable floating-point tests when lint is fixed # ["f_rv32gc", ["arch32f", "arch32f_divsqrt", "arch32f_fma"]],