Lerking/nanoBench
1
0
Fork 0
mirror of https://github.com/andreas-abel/nanoBench.git synced 2026-01-05 03:50:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

immzero variants

Browse Source
This commit is contained in:
Andreas Abel
2021-01-23 16:13:20 +01:00
parent 4b54440aaf
commit 1d4f3a458a
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/cpuBench/cpuBench.py
View File

@@ -720,17 +720,6 @@ def getTPConfigs(instrNode, useDistinctRegs=True, useIndexedAddr=False, computeI
depBreakingInstrs = getDependencyBreakingInstrsForSuppressedOperands(instrNode) depBreakingInstrs = getDependencyBreakingInstrsForSuppressedOperands(instrNode)
# instructions with multiple configs # instructions with multiple configs
if 'I8' in instrNode.attrib['string']:
configs = []
for immediate in [0, 1, 2]:
if instrNode.attrib['string'].replace('I8', str(immediate)) in instrNodeDict:
continue
config = TPConfig(note='With immediate = ' + str(immediate))
config.independentInstrs = getIndependentInstructions(instrNode, useDistinctRegs, useIndexedAddr, immediate=immediate)
config.depBreakingInstrs = depBreakingInstrs
configs.append(config)
return configs
if iclass in ['JB', 'JBE', 'JLE', 'JNB', 'JNBE', 'JNLE', 'JNO', 'JNP', 'JNS', 'JNZ', 'JO', 'JP', 'JS', 'JZ']: if iclass in ['JB', 'JBE', 'JLE', 'JNB', 'JNBE', 'JNLE', 'JNO', 'JNP', 'JNS', 'JNZ', 'JO', 'JP', 'JS', 'JZ']:
config0 = TPConfig(independentInstrs=independentInstrs, init=['pushfq; and qword ptr [RSP], ~0x8D5; popfq'], note='With all flags set to 0') config0 = TPConfig(independentInstrs=independentInstrs, init=['pushfq; and qword ptr [RSP], ~0x8D5; popfq'], note='With all flags set to 0')
config1 = TPConfig(independentInstrs=independentInstrs, init=['pushfq; or qword ptr [RSP], 0x8D5; popfq'], note='With all flags set to 1') config1 = TPConfig(independentInstrs=independentInstrs, init=['pushfq; or qword ptr [RSP], 0x8D5; popfq'], note='With all flags set to 1')
@@ -2049,8 +2038,9 @@ def getLatConfigLists(instrNode, startNode, targetNode, useDistinctRegs, addrMem
chainInstr = 'SET{} {};'.format(flag[0], reg) chainInstr = 'SET{} {};'.format(flag[0], reg)
chainLatency = basicLatency['SET' + flag[0]] chainLatency = basicLatency['SET' + flag[0]]
else: else:
chainInstr = 'CMOV{} {}, {};'.format(flag[0], reg, regToSize('R15', regSize)) chainInstr = 'CMOV{} {}, {};'.format(flag[0], regToSize('R15', regSize), regToSize('R15', regSize))
chainLatency = basicLatency['CMOV' + flag[0]] chainInstr += 'MOVSX {}, {};'.format(regTo64(reg), regToSize('R15', min(32, regSize)))
chainLatency = basicLatency['CMOV' + flag[0]] + basicLatency['MOVSX']
instrI = getInstrInstanceFromNode(instrNode, ['R15'], ['R15'], useDistinctRegs, {startNodeIdx:reg}) instrI = getInstrInstanceFromNode(instrNode, ['R15'], ['R15'], useDistinctRegs, {startNodeIdx:reg})
if reg in High8Regs: if reg in High8Regs:
@@ -2470,10 +2460,6 @@ def getLatencies(instrNode, instrNodeList, tpDict, tpDictSameReg, htmlReports):
continue continue
elif opNode1.attrib['type'] == 'flags' and depOpNode.attrib['type'] == 'flags': elif opNode1.attrib['type'] == 'flags' and depOpNode.attrib['type'] == 'flags':
continue continue
elif depOpNode == opNode1:
# ToDo: this might be unnecessary, if CMOVcc wouldn't use the same regs
newlatConfig.chainInstrs = depBreakingInstrs[depOpNode] + '; ' + latConfig.chainInstrs
depBreakingAdded = True
else: else:
if not latConfig.chainInstrs.endswith(depBreakingInstrs[depOpNode]): if not latConfig.chainInstrs.endswith(depBreakingInstrs[depOpNode]):
newlatConfig.chainInstrs = latConfig.chainInstrs + ';' + depBreakingInstrs[depOpNode] newlatConfig.chainInstrs = latConfig.chainInstrs + ';' + depBreakingInstrs[depOpNode]