From 6d1e57567b5d82f315fe41af9640953af5647a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 21 May 2024 13:02:53 +0200 Subject: [PATCH] riscv-tests: Cleanup Cabal configuration --- riscv-tests/data/instr_dict.yaml | 478 ------------------------------- riscv-tests/riscv-test.cabal | 15 +- 2 files changed, 6 insertions(+), 487 deletions(-) delete mode 100644 riscv-tests/data/instr_dict.yaml diff --git a/riscv-tests/data/instr_dict.yaml b/riscv-tests/data/instr_dict.yaml deleted file mode 100644 index f20b5e0..0000000 --- a/riscv-tests/data/instr_dict.yaml +++ /dev/null @@ -1,478 +0,0 @@ -add: - encoding: 0000000----------000-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x33' - variable_fields: - - rd - - rs1 - - rs2 -addi: - encoding: '-----------------000-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x13' - variable_fields: - - rd - - rs1 - - imm12 -and: - encoding: 0000000----------111-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x7033' - variable_fields: - - rd - - rs1 - - rs2 -andi: - encoding: '-----------------111-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x7013' - variable_fields: - - rd - - rs1 - - imm12 -auipc: - encoding: '-------------------------0010111' - extension: - - rv_i - mask: '0x7f' - match: '0x17' - variable_fields: - - rd - - imm20 -beq: - encoding: '-----------------000-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x63' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -bge: - encoding: '-----------------101-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x5063' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -bgeu: - encoding: '-----------------111-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x7063' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -blt: - encoding: '-----------------100-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x4063' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -bltu: - encoding: '-----------------110-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x6063' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -bne: - encoding: '-----------------001-----1100011' - extension: - - rv_i - mask: '0x707f' - match: '0x1063' - variable_fields: - - bimm12hi - - rs1 - - rs2 - - bimm12lo -ebreak: - encoding: '00000000000100000000000001110011' - extension: - - rv_i - mask: '0xffffffff' - match: '0x100073' - variable_fields: [] -ecall: - encoding: '00000000000000000000000001110011' - extension: - - rv_i - mask: '0xffffffff' - match: '0x73' - variable_fields: [] -fence: - encoding: '-----------------000-----0001111' - extension: - - rv_i - mask: '0x707f' - match: '0xf' - variable_fields: [] -jal: - encoding: '-------------------------1101111' - extension: - - rv_i - mask: '0x7f' - match: '0x6f' - variable_fields: - - rd - - jimm20 -jalr: - encoding: '-----------------000-----1100111' - extension: - - rv_i - mask: '0x707f' - match: '0x67' - variable_fields: - - rd - - rs1 - - imm12 -lb: - encoding: '-----------------000-----0000011' - extension: - - rv_i - mask: '0x707f' - match: '0x3' - variable_fields: - - rd - - rs1 - - imm12 -lbu: - encoding: '-----------------100-----0000011' - extension: - - rv_i - mask: '0x707f' - match: '0x4003' - variable_fields: - - rd - - rs1 - - imm12 -lh: - encoding: '-----------------001-----0000011' - extension: - - rv_i - mask: '0x707f' - match: '0x1003' - variable_fields: - - rd - - rs1 - - imm12 -lhu: - encoding: '-----------------101-----0000011' - extension: - - rv_i - mask: '0x707f' - match: '0x5003' - variable_fields: - - rd - - rs1 - - imm12 -lui: - encoding: '-------------------------0110111' - extension: - - rv_i - mask: '0x7f' - match: '0x37' - variable_fields: - - rd - - imm20 -lw: - encoding: '-----------------010-----0000011' - extension: - - rv_i - mask: '0x707f' - match: '0x2003' - variable_fields: - - rd - - rs1 - - imm12 -or: - encoding: 0000000----------110-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x6033' - variable_fields: - - rd - - rs1 - - rs2 -ori: - encoding: '-----------------110-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x6013' - variable_fields: - - rd - - rs1 - - imm12 -sb: - encoding: '-----------------000-----0100011' - extension: - - rv_i - mask: '0x707f' - match: '0x23' - variable_fields: - - imm12hi - - rs1 - - rs2 - - imm12lo -sh: - encoding: '-----------------001-----0100011' - extension: - - rv_i - mask: '0x707f' - match: '0x1023' - variable_fields: - - imm12hi - - rs1 - - rs2 - - imm12lo -sll: - encoding: 0000000----------001-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x1033' - variable_fields: - - rd - - rs1 - - rs2 -slli: - encoding: 0000000----------001-----0010011 - extension: - - rv32_i - mask: '0xfe00707f' - match: '0x1013' - variable_fields: - - rd - - rs1 - - shamtw -slt: - encoding: 0000000----------010-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x2033' - variable_fields: - - rd - - rs1 - - rs2 -slti: - encoding: '-----------------010-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x2013' - variable_fields: - - rd - - rs1 - - imm12 -sltiu: - encoding: '-----------------011-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x3013' - variable_fields: - - rd - - rs1 - - imm12 -sltu: - encoding: 0000000----------011-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x3033' - variable_fields: - - rd - - rs1 - - rs2 -sra: - encoding: 0100000----------101-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x40005033' - variable_fields: - - rd - - rs1 - - rs2 -srai: - encoding: 0100000----------101-----0010011 - extension: - - rv32_i - mask: '0xfe00707f' - match: '0x40005013' - variable_fields: - - rd - - rs1 - - shamtw -srl: - encoding: 0000000----------101-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x5033' - variable_fields: - - rd - - rs1 - - rs2 -srli: - encoding: 0000000----------101-----0010011 - extension: - - rv32_i - mask: '0xfe00707f' - match: '0x5013' - variable_fields: - - rd - - rs1 - - shamtw -sub: - encoding: 0100000----------000-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x40000033' - variable_fields: - - rd - - rs1 - - rs2 -sw: - encoding: '-----------------010-----0100011' - extension: - - rv_i - mask: '0x707f' - match: '0x2023' - variable_fields: - - imm12hi - - rs1 - - rs2 - - imm12lo -xor: - encoding: 0000000----------100-----0110011 - extension: - - rv_i - mask: '0xfe00707f' - match: '0x4033' - variable_fields: - - rd - - rs1 - - rs2 -xori: - encoding: '-----------------100-----0010011' - extension: - - rv_i - mask: '0x707f' - match: '0x4013' - variable_fields: - - rd - - rs1 - - imm12 - -div: - encoding: 0000001----------100-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2004033' - variable_fields: - - rd - - rs1 - - rs2 -divu: - encoding: 0000001----------101-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2005033' - variable_fields: - - rd - - rs1 - - rs2 -mul: - encoding: 0000001----------000-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2000033' - variable_fields: - - rd - - rs1 - - rs2 -mulh: - encoding: 0000001----------001-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2001033' - variable_fields: - - rd - - rs1 - - rs2 -mulhsu: - encoding: 0000001----------010-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2002033' - variable_fields: - - rd - - rs1 - - rs2 -mulhu: - encoding: 0000001----------011-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2003033' - variable_fields: - - rd - - rs1 - - rs2 -rem: - encoding: 0000001----------110-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2006033' - variable_fields: - - rd - - rs1 - - rs2 -remu: - encoding: 0000001----------111-----0110011 - extension: - - rv_m - mask: '0xfe00707f' - match: '0x2007033' - variable_fields: - - rd - - rs1 - - rs2 \ No newline at end of file diff --git a/riscv-tests/riscv-test.cabal b/riscv-tests/riscv-test.cabal index a7f35fa..4c80591 100644 --- a/riscv-tests/riscv-test.cabal +++ b/riscv-tests/riscv-test.cabal @@ -7,16 +7,13 @@ author: Sören Tempel, Tobias Brandt, and Christoph Lüth maintainer: Group of Computer Architecture copyright: (c) 2022 University of Bremen -data-files: - data/instr_dict.yaml - executable riscv-test main-is: Main.hs default-language: Haskell2010 build-depends: - base >= 4.15.0.0 - , libriscv >= 0.1.0.0 - , freer-simple ^>= 1.2.1.2 - , transformers ^>= 0.6.1.1 - , optparse-applicative >= 0.16.1 && <0.17 - , bv ^>= 0.5 + , libriscv ^>= 0.1.0.0 + , freer-simple + , transformers + , optparse-applicative + , bv + , base