From 32b82c7824835f0d46bd81da4cd8d811505a038d Mon Sep 17 00:00:00 2001 From: JanLJL Date: Wed, 26 Feb 2020 15:40:52 +0100 Subject: [PATCH] minor fixes and removed unnecessary load_tps --- osaca/data/csx.yml | 12 +++++++++--- osaca/data/tx2.yml | 19 ------------------- osaca/frontend.py | 2 +- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/osaca/data/csx.yml b/osaca/data/csx.yml index 02e1254..3676868 100644 --- a/osaca/data/csx.yml +++ b/osaca/data/csx.yml @@ -589,19 +589,25 @@ instruction_forms: throughput: 0.25 latency: 1.0 # 1"*"p0156 port_pressure: [[1, '0156']] -- name: ja +- name: [jo, jno, js, jns, jp, jpe, jnp, jpo] operands: - class: identifier throughput: 0.0 latency: 0.0 port_pressure: [] -- name: jb +- name: [jc, hb, jae, jnb, jna, jbe, ja, jnbe] operands: - class: identifier throughput: 0.0 latency: 0.0 port_pressure: [] -- name: jne +- name: [je, jz, jne, jnz, jl, jnge] + operands: + - class: identifier + throughput: 0.0 + latency: 0.0 + port_pressure: [] +- name: [jge, jnl, jle, jng, jg, jnle] operands: - class: identifier throughput: 0.0 diff --git a/osaca/data/tx2.yml b/osaca/data/tx2.yml index 71ce0a2..96f54e2 100644 --- a/osaca/data/tx2.yml +++ b/osaca/data/tx2.yml @@ -8,38 +8,19 @@ scheduler_size: 60 hidden_loads: false load_latency: {w: 4.0, x: 4.0, b: 4.0, h: 4.0, s: 4.0, d: 4.0, q: 4.0, v: 4.0} load_throughput: -- {base: x, index: ~, offset: ~, scale: 1, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: ~, offset: ~, scale: 1, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} -- {base: x, index: ~, offset: ~, scale: 1, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: ~, scale: 1, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: ~, scale: 8, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: ~, scale: 8, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} -- {base: x, index: ~, offset: ~, scale: 8, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: ~, scale: 8, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: ~, offset: imd, scale: 1, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: ~, offset: imd, scale: 1, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} - {base: x, index: ~, offset: imd, scale: 1, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: ~, offset: imd, scale: 1, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: imd, scale: 8, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: imd, scale: 8, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} -- {base: x, index: ~, offset: imd, scale: 8, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: ~, offset: imd, scale: 8, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: ~, scale: 1, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: ~, scale: 1, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} - {base: x, index: x, offset: ~, scale: 1, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: ~, scale: 1, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: ~, scale: 8, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: ~, scale: 8, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} -- {base: x, index: x, offset: ~, scale: 8, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: ~, scale: 8, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: imd, scale: 1, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: imd, scale: 1, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} - {base: x, index: x, offset: imd, scale: 1, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} - {base: x, index: x, offset: imd, scale: 1, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: imd, scale: 8, pre-indexed: false, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: imd, scale: 8, pre-indexed: false, post-indexed: false, port_pressure: [[1, '34']]} -- {base: x, index: x, offset: imd, scale: 8, pre-indexed: true, post-indexed: true, port_pressure: [[1, '34'], [1, '012']]} -- {base: x, index: x, offset: imd, scale: 8, pre-indexed: true, post-indexed: false, port_pressure: [[1, '34'], [1, '012']]} load_throughput_default: [[1, '34']] store_throughput: [] store_throughput_default: [[1, '34'], [1, '5']] diff --git a/osaca/frontend.py b/osaca/frontend.py index 62c9db6..7934ca8 100755 --- a/osaca/frontend.py +++ b/osaca/frontend.py @@ -132,7 +132,7 @@ class Frontend(object): ) # TODO find a way to overcome padding for different tab-lengths for dep in dep_dict: - s += '{:4d} {} {:4.1f} {} {:36}{} {}'.format( + s += '{:4d} {} {:4.1f} {} {:36}{} {}\n'.format( dep, separator, sum([instr_form['latency_lcd'] for instr_form in dep_dict[dep]['dependencies']]),