From 79afcba61de2adadd9e77244708a69ce69a045e8 Mon Sep 17 00:00:00 2001 From: JanLJL Date: Thu, 30 Jan 2020 22:33:07 +0100 Subject: [PATCH] removed possible unparseable characters from DBs --- osaca/data/bdw.yml | 28 +++++++++++------------ osaca/data/csx.yml | 54 ++++++++++++++++++++++----------------------- osaca/data/hsw.yml | 28 +++++++++++------------ osaca/data/ivb.yml | 26 +++++++++++----------- osaca/data/skx.yml | 48 ++++++++++++++++++++-------------------- osaca/data/snb.yml | 26 +++++++++++----------- osaca/data/tx2.yml | 22 +++++++++--------- osaca/data/zen1.yml | 28 +++++++++++------------ 8 files changed, 130 insertions(+), 130 deletions(-) diff --git a/osaca/data/bdw.yml b/osaca/data/bdw.yml index fc8af7f..2ddd252 100644 --- a/osaca/data/bdw.yml +++ b/osaca/data/bdw.yml @@ -26,27 +26,27 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', 0DV, '1', '2', 2D, '3', 3D, '4', '5', '6', '7'] port_model_scheme: | - ┌------------------------------------------------------------------------┐ + +------------------------------------------------------------------------+ | 64 entry unified scheduler | - └------------------------------------------------------------------------┘ + +------------------------------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ ┌--------┐ ┌------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ +--------+ +------+ | ALU | | ALU | | LD | | LD | | ST | | ALU | | ALU & | |SIMPLE| - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ | Shift | | AGU | - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ └--------┘ └------┘ - | 2ND | | Fast | | AGU | | AGU | | Fast | ┌--------┐ - | BRANCH| | LEA | └-----┘ └-----┘ | LEA | | BRANCH | - └-------┘ └-------┘ └-------┘ └--------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | Shift | | AGU | + +-------+ +-------+ +-----+ +-----+ +-------+ +--------+ +------+ + | 2ND | | Fast | | AGU | | AGU | | Fast | +--------+ + | BRANCH| | LEA | +-----+ +-----+ | LEA | | BRANCH | + +-------+ +-------+ +-------+ +--------+ + +-------+ +-------+ +-------+ |AVX DIV| |AVX FMA| | AVX | - └-------┘ └-------┘ | ALU | - ┌-------┐ ┌-------┐ └-------┘ + +-------+ +-------+ | ALU | + +-------+ +-------+ +-------+ |AVX FMA| |AVX MUL| - └-------┘ └-------┘ - ┌-------┐ ┌-------┐ + +-------+ +-------+ + +-------+ +-------+ |AVX MUL| |AVX ADD| - └-------┘ └-------┘ + +-------+ +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/csx.yml b/osaca/data/csx.yml index 325d50a..c62d28c 100644 --- a/osaca/data/csx.yml +++ b/osaca/data/csx.yml @@ -26,41 +26,41 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', 0DV, '1', '2', 2D, '3', 3D, '4', '5', '6', '7'] port_model_scheme: | - ┌------------------------------------------------------------------------┐ + +------------------------------------------------------------------------+ | 97 entry unified scheduler | - └------------------------------------------------------------------------┘ + +------------------------------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ ┌--------┐ ┌-----┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ +--------+ +-----+ | ALU | | ALU | | LD | | LD | | ST | | ALU | | ALU & | | AGU | - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ | Shift | └-----┘ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ └--------┘ - | 2ND | | Fast | | AGU | | AGU | | Fast | ┌--------┐ - | BRANCH| | LEA | └-----┘ └-----┘ | LEA | | BRANCH | - └-------┘ └-------┘ └-------┘ └--------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | Shift | +-----+ + +-------+ +-------+ +-----+ +-----+ +-------+ +--------+ + | 2ND | | Fast | | AGU | | AGU | | Fast | +--------+ + | BRANCH| | LEA | +-----+ +-----+ | LEA | | BRANCH | + +-------+ +-------+ +-------+ +--------+ + +-------+ +-------+ +-------+ |AVX DIV| |AVX FMA| | AVX | - └-------┘ └-------┘ | SHUF | - ┌-------┐ ┌-------┐ └-------┘ - |AVX FMA| |AVX MUL| ┌-------┐ - └-------┘ └-------┘ |AVX-512| - ┌-------┐ ┌-------┐ | FMA | - |AVX MUL| |AVX ADD| └-------┘ - └-------┘ └-------┘ ┌-------┐ - ┌-------┐ ┌-------┐ |AVX-512| + +-------+ +-------+ | SHUF | + +-------+ +-------+ +-------+ + |AVX FMA| |AVX MUL| +-------+ + +-------+ +-------+ |AVX-512| + +-------+ +-------+ | FMA | + |AVX MUL| |AVX ADD| +-------+ + +-------+ +-------+ +-------+ + +-------+ +-------+ |AVX-512| |AVX ADD| |AVX ALU| | ADD | - └-------┘ └-------┘ └-------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-------+ + +-------+ +-------+ +-------+ |AVX ALU| | AVX | |AVX-512| - └-------┘ | Shift | | MUL | - ┌-------┐ └-------┘ └-------┘ - | AVX | ┌-------┐ ┌-------┐ + +-------+ | Shift | | MUL | + +-------+ +-------+ +-------+ + | AVX | +-------+ +-------+ | Shift | | Slow | |AVX-512| - └-------┘ | LEA | | ALU | - ┌-------┐ └-------┘ └-------┘ - | VNNI | ┌-------┐ - └-------┘ | VNNI | - └-------┘ + +-------+ | LEA | | ALU | + +-------+ +-------+ +-------+ + | VNNI | +-------+ + +-------+ | VNNI | + +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/hsw.yml b/osaca/data/hsw.yml index 027568a..d20dd4c 100644 --- a/osaca/data/hsw.yml +++ b/osaca/data/hsw.yml @@ -26,27 +26,27 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', 0DV, '1', '2', '2D', '3', '3D', '4', '5', '6', '7'] port_model_scheme: | - ┌------------------------------------------------------------------------┐ + +------------------------------------------------------------------------+ | 60 entry unified scheduler | - └------------------------------------------------------------------------┘ + +------------------------------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ ┌--------┐ ┌------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ +--------+ +------+ | ALU | | ALU | | LD | | LD | | ST | | ALU | | ALU & | |SIMPLE| - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ | Shift | | AGU | - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ └--------┘ └------┘ - | 2ND | | Fast | | AGU | | AGU | | Fast | ┌--------┐ - | BRANCH| | LEA | └-----┘ └-----┘ | LEA | | BRANCH | - └-------┘ └-------┘ └-------┘ └--------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | Shift | | AGU | + +-------+ +-------+ +-----+ +-----+ +-------+ +--------+ +------+ + | 2ND | | Fast | | AGU | | AGU | | Fast | +--------+ + | BRANCH| | LEA | +-----+ +-----+ | LEA | | BRANCH | + +-------+ +-------+ +-------+ +--------+ + +-------+ +-------+ +-------+ |AVX DIV| |AVX FMA| | AVX | - └-------┘ └-------┘ | ALU | - ┌-------┐ ┌-------┐ └-------┘ + +-------+ +-------+ | ALU | + +-------+ +-------+ +-------+ |AVX FMA| |AVX MUL| - └-------┘ └-------┘ - ┌-------┐ ┌-------┐ + +-------+ +-------+ + +-------+ +-------+ |AVX MUL| |AVX ADD| - └-------┘ └-------┘ + +-------+ +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/ivb.yml b/osaca/data/ivb.yml index 823ad31..0a3db03 100644 --- a/osaca/data/ivb.yml +++ b/osaca/data/ivb.yml @@ -26,25 +26,25 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', '0DV', '1', '2', '2D', '3', '3D', '4', '5'] port_model_scheme: | - ┌-----------------------------------------------------┐ + +-----------------------------------------------------+ | 54 entry scheduler | - └-----------------------------------------------------┘ + +-----------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | ALU | | ALU | | LD | | LD | | ST | | ALU | - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ + +-------+ +-------+ +-----+ +-----+ +-------+ |AVX DIV| | Fast | | AGU | | AGU | | BRANCH| - └-------┘ | LEA | └-----┘ └-----┘ └-------┘ - ┌-------┐ └-------┘ ┌-------┐ - |AVX MUL| ┌-------┐┌-------┐ | Fast | - └-------┘ |AVX ADD||AVX FMA| | LEA | - ┌-------┐ └-------┘└-------┘ └-------┘ - | AVX |┌-------┐ ┌-------┐ ┌-------┐ + +-------+ | LEA | +-----+ +-----+ +-------+ + +-------+ +-------+ +-------+ + |AVX MUL| +-------++-------+ | Fast | + +-------+ |AVX ADD||AVX FMA| | LEA | + +-------+ +-------++-------+ +-------+ + | AVX |+-------+ +-------+ +-------+ | Shift ||AVX FMA| |AVX MUL| | AVX | - └-------┘└-------┘ └-------┘ | SHUF | - └-------┘ + +-------++-------+ +-------+ | SHUF | + +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/skx.yml b/osaca/data/skx.yml index 298f9cd..8c143cc 100644 --- a/osaca/data/skx.yml +++ b/osaca/data/skx.yml @@ -26,38 +26,38 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', 0DV, '1', '2', 2D, '3', 3D, '4', '5', '6', '7'] port_model_scheme: | - ┌------------------------------------------------------------------------┐ + +------------------------------------------------------------------------+ | 97 entry unified scheduler | - └------------------------------------------------------------------------┘ + +------------------------------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ ┌--------┐ ┌-----┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ +--------+ +-----+ | ALU | | ALU | | LD | | LD | | ST | | ALU | | ALU & | | AGU | - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ | Shift | └-----┘ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ └--------┘ - | 2ND | | Fast | | AGU | | AGU | | Fast | ┌--------┐ - | BRANCH| | LEA | └-----┘ └-----┘ | LEA | | BRANCH | - └-------┘ └-------┘ └-------┘ └--------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | Shift | +-----+ + +-------+ +-------+ +-----+ +-----+ +-------+ +--------+ + | 2ND | | Fast | | AGU | | AGU | | Fast | +--------+ + | BRANCH| | LEA | +-----+ +-----+ | LEA | | BRANCH | + +-------+ +-------+ +-------+ +--------+ + +-------+ +-------+ +-------+ |AVX DIV| |AVX FMA| | AVX | - └-------┘ └-------┘ | SHUF | - ┌-------┐ ┌-------┐ └-------┘ - |AVX FMA| |AVX MUL| ┌-------┐ - └-------┘ └-------┘ |AVX-512| - ┌-------┐ ┌-------┐ | FMA | - |AVX MUL| |AVX ADD| └-------┘ - └-------┘ └-------┘ ┌-------┐ - ┌-------┐ ┌-------┐ |AVX-512| + +-------+ +-------+ | SHUF | + +-------+ +-------+ +-------+ + |AVX FMA| |AVX MUL| +-------+ + +-------+ +-------+ |AVX-512| + +-------+ +-------+ | FMA | + |AVX MUL| |AVX ADD| +-------+ + +-------+ +-------+ +-------+ + +-------+ +-------+ |AVX-512| |AVX ADD| |AVX ALU| | ADD | - └-------┘ └-------┘ └-------┘ - ┌-------┐ ┌-------┐ ┌-------┐ + +-------+ +-------+ +-------+ + +-------+ +-------+ +-------+ |AVX ALU| | AVX | |AVX-512| - └-------┘ | Shift | | MUL | - ┌-------┐ └-------┘ └-------┘ - | AVX | ┌-------┐ ┌-------┐ + +-------+ | Shift | | MUL | + +-------+ +-------+ +-------+ + | AVX | +-------+ +-------+ | Shift | | Slow | |AVX-512| - └-------┘ | LEA | | ALU | - └-------┘ └-------┘ + +-------+ | LEA | | ALU | + +-------+ +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/snb.yml b/osaca/data/snb.yml index d20a330..2abf1a5 100644 --- a/osaca/data/snb.yml +++ b/osaca/data/snb.yml @@ -26,25 +26,25 @@ store_throughput: store_throughput_default: [[1, '23'], [1, '4']] ports: ['0', '0DV', '1', '2', '2D', '3', '3D', '4', '5'] port_model_scheme: | - ┌-----------------------------------------------------┐ + +-----------------------------------------------------+ | 54 entry scheduler | - └-----------------------------------------------------┘ + +-----------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-----┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ | ALU | | ALU | | LD | | LD | | ST | | ALU | - └-------┘ └-------┘ └-----┘ └-----┘ └-----┘ └-------┘ - ┌-------┐ ┌-------┐ ┌-----┐ ┌-----┐ ┌-------┐ + +-------+ +-------+ +-----+ +-----+ +-----+ +-------+ + +-------+ +-------+ +-----+ +-----+ +-------+ |AVX DIV| | Fast | | AGU | | AGU | | BRANCH| - └-------┘ | LEA | └-----┘ └-----┘ └-------┘ - ┌-------┐ └-------┘ ┌-------┐ - |AVX MUL| ┌-------┐┌-------┐ | Fast | - └-------┘ |AVX ADD||AVX FMA| | LEA | - ┌-------┐ └-------┘└-------┘ └-------┘ - | AVX |┌-------┐ ┌-------┐ ┌-------┐ + +-------+ | LEA | +-----+ +-----+ +-------+ + +-------+ +-------+ +-------+ + |AVX MUL| +-------++-------+ | Fast | + +-------+ |AVX ADD||AVX FMA| | LEA | + +-------+ +-------++-------+ +-------+ + | AVX |+-------+ +-------+ +-------+ | Shift ||AVX FMA| |AVX MUL| | AVX | - └-------┘└-------┘ └-------┘ | SHUF | - └-------┘ + +-------++-------+ +-------+ | SHUF | + +-------+ instruction_forms: - name: LEA operands: diff --git a/osaca/data/tx2.yml b/osaca/data/tx2.yml index f46b7ae..74b5aef 100644 --- a/osaca/data/tx2.yml +++ b/osaca/data/tx2.yml @@ -45,26 +45,26 @@ store_throughput: [] store_throughput_default: [[1, '34'], [1, '5']] ports: ['0', 0DV, '1', 1DV, '2', '3', '4', '5'] port_model_scheme: | - ┌-----------------------------------------------------------┐ + +-----------------------------------------------------------+ | 60 entry unified scheduler | - └-----------------------------------------------------------┘ + +-----------------------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | ▼ ▼ ▼ ▼ ▼ ▼ - ┌------┐ ┌------┐ ┌------┐ ┌------┐ ┌------┐ ┌------┐ + +------+ +------+ +------+ +------+ +------+ +------+ | ALU | | ALU | | ALU/ | | LD | | LD | | ST | - └------┘ └------┘ | BR | └------┘ └------┘ └------┘ - ┌------┐ ┌------┐ └------┘ ┌------┐ ┌------┐ + +------+ +------+ | BR | +------+ +------+ +------+ + +------+ +------+ +------+ +------+ +------+ | FP/ | | FP/ | | AGU | | AGU | - | NEON | | NEON | └------┘ └------┘ - └------┘ └------┘ - ┌------┐ + | NEON | | NEON | +------+ +------+ + +------+ +------+ + +------+ | INT | | MUL/ | | DIV | - └------┘ - ┌------┐ + +------+ + +------+ |CRYPTO| - └------┘ + +------+ instruction_forms: - name: add operands: diff --git a/osaca/data/zen1.yml b/osaca/data/zen1.yml index 04cc887..3bbea69 100644 --- a/osaca/data/zen1.yml +++ b/osaca/data/zen1.yml @@ -19,25 +19,25 @@ store_throughput_default: [[1, '89'], [1,[ST]]] hidden_loads: false ports: ['0', '1', '2', '3', 3DV, '4', '5', '6', '7', '8', '9', 8D, 9D, ST] port_model_scheme: | - ┌--------------------------------------┐ ┌-----------------------------------------------┐ + +--------------------------------------+ +-----------------------------------------------+ | 96 entries OoO scheduler | | 84 entries OoO scheduler | - └--------------------------------------┘ └-----------------------------------------------┘ + +--------------------------------------+ +-----------------------------------------------+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ ▼ - ┌-------┐ ┌-------┐ ┌-------┐ ┌-------┐ ┌------┐ ┌-----┐ ┌-----┐ ┌------┐ ┌-----┐ ┌-----┐ + +-------+ +-------+ +-------+ +-------+ +------+ +-----+ +-----+ +------+ +-----+ +-----+ |SSE ALU| |SSE ALU| |SSE ALU| |SSE ALU| | ALU | | ALU | | ALU | | ALU | | AGU | | AGU | - └-------┘ └-------┘ └-------┘ └-------┘ └------┘ └-----┘ └-----┘ └------┘ └-----┘ └-----┘ - ┌-------┐ ┌-------┐ ┌-------┐ ┌-------┐ ┌------┐ ┌-----┐ ┌-----┐ ┌------┐ | | + +-------+ +-------+ +-------+ +-------+ +------+ +-----+ +-----+ +------+ +-----+ +-----+ + +-------+ +-------+ +-------+ +-------+ +------+ +-----+ +-----+ +------+ | | |SSE MUL| |SSE MUL| |SSE ADD| |SSE ADD| |BRANCH| | MUL | | DIV | |BRANCH| ▼ ▼ - └-------┘ └-------┘ └-------┘ └-------┘ └------┘ └-----┘ └-----┘ └------┘ ┌-------------┐ - ┌-------┐ ┌-------┐ ┌-------┐ ┌-------┐ | LOAD | - |SSE FMA| |SSE FMA| | SSE | |SSE DIV| └-------------┘ - └-------┘ └-------┘ | SHUF | └-------┘ ┌-------------┐ - ┌-------┐ └-------┘ | LOAD | - | SSE | └-------------┘ - | SHUF | ┌-------------┐ - └-------┘ | STORE | - └-------------┘ + +-------+ +-------+ +-------+ +-------+ +------+ +-----+ +-----+ +------+ +-------------+ + +-------+ +-------+ +-------+ +-------+ | LOAD | + |SSE FMA| |SSE FMA| | SSE | |SSE DIV| +-------------+ + +-------+ +-------+ | SHUF | +-------+ +-------------+ + +-------+ +-------+ | LOAD | + | SSE | +-------------+ + | SHUF | +-------------+ + +-------+ | STORE | + +-------------+ instruction_forms: - name: add operands: