Lerking/OSACA
1
0
Fork 0
mirror of https://github.com/RRZE-HPC/OSACA.git synced 2026-01-04 18:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

added machine-readable output feature

Browse Source
This commit is contained in:
Jan Laukemann
2018-12-17 18:08:20 +01:00
parent 030354b675
commit bade065fed
4 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osaca/eu_sched.py
View File

@@ -8,6 +8,7 @@ from operator import add
import pandas as pd
from osaca.param import Register, MemAddr
#from param import Register, MemAddr
class Scheduler(object):
@@ -48,15 +49,22 @@ class Scheduler(object):
osaca_dir = os.path.expanduser('~/.osaca/')
self.df = pd.read_csv(osaca_dir + 'data/' + arch.lower() + '_data.csv', quotechar='"',
converters={'ports': ast.literal_eval})
def new_schedule(self):
def new_schedule(self, machine_readable=False):
"""
Schedules Instruction Form list and calculates port bindings.
Parameters
----------
machine_readable : bool
Boolean for indicating if the return value should be human readable (if False) or
machine readable (if True)
Returns
-------
(str, [int, ...])
A tuple containing the graphic output of the schedule as string and
the port bindings as list of ints.
(str, [float, ...]) or ([[float, ...], ...], [float, ...])
A tuple containing the output of the schedule as string (if machine_readable is not
given or False) or as list of lists (if machine_readable is True) and the port bindings
as list of float.
"""
sched = self.get_head()
# Initialize ports
@@ -113,6 +121,9 @@ class Scheduler(object):
sched += self.get_line(occ_ports[i], instrForm[-1])
# Add throughput to total port binding
port_bndgs = list(map(add, port_bndgs, occ_ports[i]))
if(machine_readable):
list(map(self.append, occ_ports, self.instrList))
return (occ_ports, port_bndgs)
return (sched, port_bndgs)
def schedule(self):
@@ -180,6 +191,10 @@ class Scheduler(object):
return self.flatten(l[0]) + self.flatten(l[1:])
return l[:1] + self.flatten(l[1:])
def append(self, l, e):
if(isinstance(l, list)):
l.append(e)
def schedule_fcfs(self):
"""
Schedules Instruction Form list for a single run with latencies.

2
osaca/get_instr.py
View File

@@ -5,6 +5,8 @@ import argparse
from osaca.testcase import Testcase
from osaca.param import Register, MemAddr, Parameter
#from testcase import Testcase
#from param import Register, MemAddr, Parameter
class InstrExtractor(object):

41
osaca/osaca.py
View File

@@ -14,6 +14,9 @@ import numpy as np
from osaca.param import Register, MemAddr, Parameter
from osaca.eu_sched import Scheduler
from osaca.testcase import Testcase
#from param import Register, MemAddr, Parameter
#from eu_sched import Scheduler
#from testcase import Testcase
class Osaca(object):
@@ -33,6 +36,7 @@ class Osaca(object):
# Variables for creating output
longestInstr = 30
machine_readable = False
# Constants
ASM_LINE = re.compile(r'\s[0-9a-f]+[:]')
# Matches every variation of the IACA start marker
@@ -75,7 +79,7 @@ class Osaca(object):
self.df = self.read_csv()
# Create sequence of numbers and their reciprokals for validate the measurements
cyc_list, reci_list = self.create_sequences()
print('Everything seems fine! Let\'s start!', file=self.file_output)
#print('Everything seems fine! Let\'s start!', file=self.file_output)
new_data = []
added_vals = 0
for line in self.srcCode:
@@ -153,14 +157,17 @@ class Osaca(object):
# Finally check for database for the chosen architecture
self.df = self.read_csv()
print('Everything seems fine! Let\'s start checking!', file=self.file_output)
#print('Everything seems fine! Let\'s start checking!', file=self.file_output)
for i, line in enumerate(self.srcCode):
if(i == 0):
self.check_line(line, True)
else:
self.check_line(line)
output = self.create_output(self.tp_list)
print(output, file=self.file_output)
output = self.create_output(self.tp_list, True, self.machine_readable)
if(self.machine_readable):
return output
else:
print(output, file=self.file_output)
def inspect_with_iaca(self):
"""
@@ -181,13 +188,16 @@ class Osaca(object):
# Finally check for database for the chosen architecture
self.df = self.read_csv()
print('Everything seems fine! Let\'s start checking!', file=self.file_output)
#print('Everything seems fine! Let\'s start checking!', file=self.file_output)
if(binary_file):
self.iaca_bin()
else:
self.iaca_asm()
output = self.create_output(self.tp_list)
print(output, file=self.file_output)
output = self.create_output(self.tp_list, True, self.machine_readable)
if(self.machine_readable):
return output
else:
print(output, file=self.file_output)
# --------------------------------------------------------------------------
@@ -618,7 +628,7 @@ class Osaca(object):
return self.flatten(l[0]) + self.flatten(l[1:])
return l[:1] + self.flatten(l[1:])
def create_output(self, tp_list=False, pr_sched=True):
def create_output(self, tp_list=False, pr_sched=True, machine_readable=False):
"""
Creates output of analysed file including a time stamp.
@@ -650,7 +660,10 @@ class Osaca(object):
if(pr_sched):
output += '\n\n'
sched = Scheduler(self.arch, self.instr_forms)
sched_output, port_binding = sched.new_schedule()
sched_output, port_binding = sched.new_schedule(machine_readable)
# if machine_readable, we're already done here
if(machine_readable):
return sched_output
binding = sched.get_port_binding(port_binding)
output += sched.get_report_info() + '\n' + binding + '\n\n' + sched_output
block_tp = round(max(port_binding), 2)
@@ -834,6 +847,8 @@ def main():
group.add_argument('-m', '--insert-marker', dest='insert_marker', action='store_true',
help='try to find blocks probably corresponding to loops in assembly and'
+ 'insert IACA marker')
parser.add_argument('-l', '--list-output', dest='machine_readable', action='store_true',
help='returns output as machine readable list of lists')
parser.add_argument('filepath', type=str, help='path to object (Binary, ASM, CSV)')
# Store args in global variables
@@ -852,6 +867,10 @@ def main():
osaca = Osaca(arch, filepath)
if(inp.tp_list):
osaca.tp_list = True
if(inp.machine_readable):
osaca.machine_readable = True
osaca.output = None
if(incl_ibench):
try:
@@ -860,7 +879,7 @@ def main():
print('Please specify an architecture.', file=sys.stderr)
elif(iaca_flag):
try:
osaca.inspect_with_iaca()
return osaca.inspect_with_iaca()
except UnboundLocalError:
print('Please specify an architecture.', file=sys.stderr)
elif(insert_m):
@@ -878,7 +897,7 @@ def main():
iaca.iaca_instrumentation(input_file=f_in, output_file=f_out,
block_selection='manual', pointer_increment=1)
else:
osaca.inspect_binary()
return osaca.inspect_binary()
# ------------Main method--------------

1
osaca/testcase.py
View File

@@ -5,6 +5,7 @@ from subprocess import call
from math import ceil
from osaca.param import Register, MemAddr, Parameter
#from param import Register, MemAddr, Parameter
class Testcase(object):