Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-03 02:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from ross144/main

Browse Source 
Fixed branch predictor embench generation results
This commit is contained in:
David Harris 2023-11-17 10:07:30 -08:00 committed by GitHub
commit 8baa5b2e7b
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/parseHPMC.py
View File

@ -180,9 +180,11 @@ def ExtractSelectedData(benchmarkFirstList):
benchmarkDict = { } benchmarkDict = { }
for benchmark in benchmarkFirstList: for benchmark in benchmarkFirstList:
(name, opt, config, prefixName, entries, dataDict) = benchmark (name, opt, config, prefixName, entries, dataDict) = benchmark
if opt == 'bd_speedopt_speed': NewName = name+'Sp' # use this code to distinguish speed opt and size opt.
elif opt == 'bd_sizeopt_speed': NewName = name+'Sz' #if opt == 'bd_speedopt_speed': NewName = name+'Sp'
else: NewName = name #elif opt == 'bd_sizeopt_speed': NewName = name+'Sz'
#else: NewName = name
NewName = name
#print(NewName) #print(NewName)
#NewName = name+'_'+opt #NewName = name+'_'+opt
if NewName in benchmarkDict: if NewName in benchmarkDict:
@ -242,7 +244,7 @@ def ReportAsText(benchmarkDict):
def Inversion(lst): def Inversion(lst):
return [x if not args.invert else 100 - x for x in lst] return [x if not args.invert else 100 - x for x in lst]
def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName): def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName, IncludeLegend):
index = 0 index = 0
NumberInGroup = len(seriesDict) NumberInGroup = len(seriesDict)
# Figure out width of bars. NumberInGroup bars + want 2 bar space # Figure out width of bars. NumberInGroup bars + want 2 bar space
@ -260,8 +262,8 @@ def BarGraph(seriesDict, xlabelList, BenchPerRow, FileName):
plt.xticks([r + barWidth*(NumberInGroup/2-0.5) for r in range(0, BenchPerRow)], xlabelList) plt.xticks([r + barWidth*(NumberInGroup/2-0.5) for r in range(0, BenchPerRow)], xlabelList)
plt.xlabel('Benchmark') plt.xlabel('Benchmark')
if(not args.invert): plt.ylabel('Misprediction Rate (%)') if(not args.invert): plt.ylabel('Misprediction Rate (%)')
else: plt.ylabel('Prediction Accuracy (%)') else: plt.ylabel('Prediction Accuracy (%)')
plt.legend(loc='upper left', ncol=2) if(IncludeLegend): plt.legend(loc='upper right', ncol=2)
plt.savefig(FileName) plt.savefig(FileName)
def SelectPartition(xlabelListBig, seriesDictBig, group, BenchPerRow): def SelectPartition(xlabelListBig, seriesDictBig, group, BenchPerRow):
@ -350,13 +352,13 @@ def ReportAsGraph(benchmarkDict, bar):
# index += 1 # index += 1
if(not args.summary): if(not args.summary):
size = len(benchmarkDict) NumBenchmarks = len(benchmarkDict)
sizeSqrt = math.sqrt(size) NumBenchmarksSqrt = math.sqrt(NumBenchmarks)
isSquare = math.isclose(sizeSqrt, round(sizeSqrt)) isSquare = math.isclose(NumBenchmarksSqrt, round(NumBenchmarksSqrt))
numCol = math.floor(sizeSqrt) numCol = math.floor(NumBenchmarksSqrt)
numRow = numCol + (0 if isSquare else 1) numRow = numCol + (0 if isSquare else 1)
index = 1 index = 1
BenchPerRow = 7 BenchPerRow = 5
xlabelList = [] xlabelList = []
seriesDict = {} seriesDict = {}
@ -385,11 +387,11 @@ def ReportAsGraph(benchmarkDict, bar):
#The next step will be to split the benchmarkDict into length BenchPerRow pieces then repeat the following code #The next step will be to split the benchmarkDict into length BenchPerRow pieces then repeat the following code
# on each piece. # on each piece.
for row in range(0, math.ceil(39 / BenchPerRow)): for row in range(0, math.ceil(NumBenchmarks / BenchPerRow)):
(xlabelListTrunk, seriesDictTrunk) = SelectPartition(xlabelListBig, seriesDictBig, row, BenchPerRow) (xlabelListTrunk, seriesDictTrunk) = SelectPartition(xlabelListBig, seriesDictBig, row, BenchPerRow)
FileName = 'barSegment%d.png' % row FileName = 'barSegment%d.png' % row
groupLen = len(xlabelListTrunk) groupLen = len(xlabelListTrunk)
BarGraph(seriesDictTrunk, xlabelListTrunk, groupLen, FileName) BarGraph(seriesDictTrunk, xlabelListTrunk, groupLen, FileName, (row == 0))
# main # main

4
testbench/testbench.sv
View File

@ -37,7 +37,7 @@ module testbench;
parameter DEBUG=0; parameter DEBUG=0;
parameter TEST="none"; parameter TEST="none";
parameter PrintHPMCounters=0; parameter PrintHPMCounters=0;
parameter BPRED_LOGGER=0; parameter BPRED_LOGGER=1;
parameter I_CACHE_ADDR_LOGGER=0; parameter I_CACHE_ADDR_LOGGER=0;
parameter D_CACHE_ADDR_LOGGER=0; parameter D_CACHE_ADDR_LOGGER=0;
@ -434,7 +434,7 @@ module testbench;
loggers (clk, reset, DCacheFlushStart, DCacheFlushDone, memfilename); loggers (clk, reset, DCacheFlushStart, DCacheFlushDone, memfilename);
// track the current function or global label // track the current function or global label
if (DEBUG == 1 | (PrintHPMCounters & P.ZICNTR_SUPPORTED)) begin : FunctionName if (DEBUG == 1 | ((PrintHPMCounters | BPRED_LOGGER) & P.ZICNTR_SUPPORTED)) begin : FunctionName
FunctionName #(P) FunctionName(.reset(reset_ext | TestBenchReset), FunctionName #(P) FunctionName(.reset(reset_ext | TestBenchReset),
.clk(clk), .ProgramAddrMapFile(ProgramAddrMapFile), .ProgramLabelMapFile(ProgramLabelMapFile)); .clk(clk), .ProgramAddrMapFile(ProgramAddrMapFile), .ProgramLabelMapFile(ProgramLabelMapFile));
end end