Reorganise Python code using pyproject.toml

Add pyproject.toml (the modern alternative to requirements.txt), making this a proper Python package that can be installed via pip and potentially uploaded to PyPI. This required moving all of the data files into the package, and reading them using importlib. This gives a much nicer file structure. It does require Python 3.7 but that is over 6 years old and easy to install on old Linux distros like RHEL 8.
riscv · Oct 4, 2024 · d980336 · d980336
1 parent 0033120
commit d980336
Show file tree

Hide file tree

Showing 120 changed files with 81 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ inst.sverilog
 instr_dict.yaml
 
 __pycache__/
+
+/.venv
diff --git a/Makefile b/Makefile
@@ -5,35 +5,36 @@ ENV_H := ../riscv-tests/env/encoding.h
 OPENOCD_H := ../riscv-openocd/src/target/riscv/encoding.h
 INSTALL_HEADER_FILES := $(ISASIM_H) $(PK_H) $(ENV_H) $(OPENOCD_H)
 
+.PHONY : default
 default: everything
 
 .PHONY : everything
 everything:
-	@./parse.py -c -go -chisel -sverilog -rust -latex -spinalhdl $(EXTENSIONS)
+	@./parse.sh -c -go -chisel -sverilog -rust -latex -spinalhdl $(EXTENSIONS)
 
 .PHONY : encoding.out.h
 encoding.out.h:
-	@./parse.py -c rv* unratified/rv_* unratified/rv32* unratified/rv64*
+	@./parse.sh -c rv* unratified/rv_* unratified/rv32* unratified/rv64*
 
 .PHONY : inst.chisel
 inst.chisel:
-	@./parse.py -chisel $(EXTENSIONS)
+	@./parse.sh -chisel $(EXTENSIONS)
 
 .PHONY : inst.go
 inst.go:
-	@./parse.py -go $(EXTENSIONS)
+	@./parse.sh -go $(EXTENSIONS)
 
 .PHONY : latex
 latex:
-	@./parse.py -latex $(EXTENSIONS)
+	@./parse.sh -latex $(EXTENSIONS)
 
 .PHONY : inst.sverilog
 inst.sverilog:
-	@./parse.py -sverilog $(EXTENSIONS)
+	@./parse.sh -sverilog $(EXTENSIONS)
 
 .PHONY : inst.rs
 inst.rs:
-	@./parse.py -rust $(EXTENSIONS)
+	@./parse.sh -rust $(EXTENSIONS)
 
 .PHONY : clean
 clean:
@@ -51,4 +52,4 @@ priv-instr-table.tex: latex
 
 .PHONY: inst.spinalhdl
 inst.spinalhdl:
-	@./parse.py -spinalhdl $(EXTENSIONS)
+	@./parse.sh -spinalhdl $(EXTENSIONS)
diff --git a/parse.sh b/parse.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# This is a simple script to handle Python's venv nonsense.
+
+set -e
+
+# Create the virtual environment if it doesn't already exist.
+if [ ! -e ".venv/bin/activate" ]; then
+    echo "Creating venv"
+    python3 -m venv ".venv"
+fi
+
+# Activate it
+. ".venv/bin/activate"
+
+# See https://github.com/microsoft/pyright/issues/6209#issuecomment-1772924061
+# for why editable_mode=compat is required.
+python3 -m pip install --config-settings editable_mode=compat --editable .
+
+riscv_opcodes $@
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,26 @@
+[project]
+name = "riscv-opcodes"
+version = "0.1.0"
+description = "Machine readable information about RISC-V instruction opcodes"
+dependencies = [
+    "PyYAML>=6.0.0, <7"
+]
+readme = "README.md"
+requires-python = ">= 3.7"
+
+[project.scripts]
+riscv_opcodes = "riscv_opcodes.parse:main"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.rye]
+managed = true
+dev-dependencies = []
+
+[tool.hatch.metadata]
+allow-direct-references = true
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/riscv_opcodes"]
diff --git a/requirements.txt b/requirements.txt
diff --git a/constants.py → src/riscv_opcodes/constants.py b/constants.py → src/riscv_opcodes/constants.py
@@ -1,6 +1,6 @@
 import re
 import csv
-
+from importlib.resources import open_text
 
 overlapping_extensions = {
     'rv_zcmt': {'rv_c_d'},
@@ -42,14 +42,14 @@ def read_csv(filename):
     """
     Reads a CSV file and returns a list of tuples.
     Each tuple contains an integer value (from the first column) and a string (from the second column).
-    
+
     Args:
         filename (str): The name of the CSV file to read.
-    
+
     Returns:
         list of tuple: A list of (int, str) tuples extracted from the CSV file.
     """
-    with open(filename) as f:
+    with open_text("riscv_opcodes.opcodes", filename) as f:
         csv_reader = csv.reader(f, skipinitialspace=True)
         return [(int(row[0], 0), row[1]) for row in csv_reader]
 
@@ -58,7 +58,7 @@ def read_csv(filename):
 csrs32 = read_csv("csrs32.csv")
 
 arg_lut = {}
-with open("arg_lut.csv") as f:
+with open_text("riscv_opcodes.opcodes", "arg_lut.csv") as f:
     csv_reader = csv.reader(f, skipinitialspace=True)
     for row in csv_reader:
         k = row[0]

diff --git a/encoding.h → src/riscv_opcodes/encoding.h b/encoding.h → src/riscv_opcodes/encoding.h
diff --git a/arg_lut.csv → src/riscv_opcodes/opcodes/arg_lut.csv b/arg_lut.csv → src/riscv_opcodes/opcodes/arg_lut.csv
diff --git a/causes.csv → src/riscv_opcodes/opcodes/causes.csv b/causes.csv → src/riscv_opcodes/opcodes/causes.csv
diff --git a/csrs.csv → src/riscv_opcodes/opcodes/csrs.csv b/csrs.csv → src/riscv_opcodes/opcodes/csrs.csv
diff --git a/csrs32.csv → src/riscv_opcodes/opcodes/csrs32.csv b/csrs32.csv → src/riscv_opcodes/opcodes/csrs32.csv
diff --git a/rv32_c → src/riscv_opcodes/opcodes/ratified/rv32_c b/rv32_c → src/riscv_opcodes/opcodes/ratified/rv32_c
diff --git a/rv32_c_f → src/riscv_opcodes/opcodes/ratified/rv32_c_f b/rv32_c_f → src/riscv_opcodes/opcodes/ratified/rv32_c_f
diff --git a/rv32_d_zfa → ...riscv_opcodes/opcodes/ratified/rv32_d_zfa b/rv32_d_zfa → ...riscv_opcodes/opcodes/ratified/rv32_d_zfa
diff --git a/rv32_i → src/riscv_opcodes/opcodes/ratified/rv32_i b/rv32_i → src/riscv_opcodes/opcodes/ratified/rv32_i
diff --git a/rv32_zbb → src/riscv_opcodes/opcodes/ratified/rv32_zbb b/rv32_zbb → src/riscv_opcodes/opcodes/ratified/rv32_zbb
diff --git a/rv32_zbkb → src/riscv_opcodes/opcodes/ratified/rv32_zbkb b/rv32_zbkb → src/riscv_opcodes/opcodes/ratified/rv32_zbkb
diff --git a/rv32_zbs → src/riscv_opcodes/opcodes/ratified/rv32_zbs b/rv32_zbs → src/riscv_opcodes/opcodes/ratified/rv32_zbs
diff --git a/rv32_zicntr → ...iscv_opcodes/opcodes/ratified/rv32_zicntr b/rv32_zicntr → ...iscv_opcodes/opcodes/ratified/rv32_zicntr
diff --git a/rv32_zk → src/riscv_opcodes/opcodes/ratified/rv32_zk b/rv32_zk → src/riscv_opcodes/opcodes/ratified/rv32_zk
diff --git a/rv32_zkn → src/riscv_opcodes/opcodes/ratified/rv32_zkn b/rv32_zkn → src/riscv_opcodes/opcodes/ratified/rv32_zkn
diff --git a/rv32_zknd → src/riscv_opcodes/opcodes/ratified/rv32_zknd b/rv32_zknd → src/riscv_opcodes/opcodes/ratified/rv32_zknd
diff --git a/rv32_zkne → src/riscv_opcodes/opcodes/ratified/rv32_zkne b/rv32_zkne → src/riscv_opcodes/opcodes/ratified/rv32_zkne
diff --git a/rv32_zknh → src/riscv_opcodes/opcodes/ratified/rv32_zknh b/rv32_zknh → src/riscv_opcodes/opcodes/ratified/rv32_zknh
diff --git a/rv32_zks → src/riscv_opcodes/opcodes/ratified/rv32_zks b/rv32_zks → src/riscv_opcodes/opcodes/ratified/rv32_zks
diff --git a/rv64_a → src/riscv_opcodes/opcodes/ratified/rv64_a b/rv64_a → src/riscv_opcodes/opcodes/ratified/rv64_a
diff --git a/rv64_c → src/riscv_opcodes/opcodes/ratified/rv64_c b/rv64_c → src/riscv_opcodes/opcodes/ratified/rv64_c
diff --git a/rv64_d → src/riscv_opcodes/opcodes/ratified/rv64_d b/rv64_d → src/riscv_opcodes/opcodes/ratified/rv64_d
diff --git a/rv64_f → src/riscv_opcodes/opcodes/ratified/rv64_f b/rv64_f → src/riscv_opcodes/opcodes/ratified/rv64_f
diff --git a/rv64_h → src/riscv_opcodes/opcodes/ratified/rv64_h b/rv64_h → src/riscv_opcodes/opcodes/ratified/rv64_h
diff --git a/rv64_i → src/riscv_opcodes/opcodes/ratified/rv64_i b/rv64_i → src/riscv_opcodes/opcodes/ratified/rv64_i
diff --git a/rv64_m → src/riscv_opcodes/opcodes/ratified/rv64_m b/rv64_m → src/riscv_opcodes/opcodes/ratified/rv64_m
diff --git a/rv64_q → src/riscv_opcodes/opcodes/ratified/rv64_q b/rv64_q → src/riscv_opcodes/opcodes/ratified/rv64_q
diff --git a/rv64_q_zfa → ...riscv_opcodes/opcodes/ratified/rv64_q_zfa b/rv64_q_zfa → ...riscv_opcodes/opcodes/ratified/rv64_q_zfa
diff --git a/rv64_zacas → ...riscv_opcodes/opcodes/ratified/rv64_zacas b/rv64_zacas → ...riscv_opcodes/opcodes/ratified/rv64_zacas
diff --git a/rv64_zba → src/riscv_opcodes/opcodes/ratified/rv64_zba b/rv64_zba → src/riscv_opcodes/opcodes/ratified/rv64_zba
diff --git a/rv64_zbb → src/riscv_opcodes/opcodes/ratified/rv64_zbb b/rv64_zbb → src/riscv_opcodes/opcodes/ratified/rv64_zbb
diff --git a/rv64_zbkb → src/riscv_opcodes/opcodes/ratified/rv64_zbkb b/rv64_zbkb → src/riscv_opcodes/opcodes/ratified/rv64_zbkb
diff --git a/rv64_zbs → src/riscv_opcodes/opcodes/ratified/rv64_zbs b/rv64_zbs → src/riscv_opcodes/opcodes/ratified/rv64_zbs
diff --git a/rv64_zcb → src/riscv_opcodes/opcodes/ratified/rv64_zcb b/rv64_zcb → src/riscv_opcodes/opcodes/ratified/rv64_zcb
diff --git a/rv64_zfh → src/riscv_opcodes/opcodes/ratified/rv64_zfh b/rv64_zfh → src/riscv_opcodes/opcodes/ratified/rv64_zfh
diff --git a/rv64_zk → src/riscv_opcodes/opcodes/ratified/rv64_zk b/rv64_zk → src/riscv_opcodes/opcodes/ratified/rv64_zk
diff --git a/rv64_zkn → src/riscv_opcodes/opcodes/ratified/rv64_zkn b/rv64_zkn → src/riscv_opcodes/opcodes/ratified/rv64_zkn
diff --git a/rv64_zknd → src/riscv_opcodes/opcodes/ratified/rv64_zknd b/rv64_zknd → src/riscv_opcodes/opcodes/ratified/rv64_zknd
diff --git a/rv64_zkne → src/riscv_opcodes/opcodes/ratified/rv64_zkne b/rv64_zkne → src/riscv_opcodes/opcodes/ratified/rv64_zkne
diff --git a/rv64_zknh → src/riscv_opcodes/opcodes/ratified/rv64_zknh b/rv64_zknh → src/riscv_opcodes/opcodes/ratified/rv64_zknh
diff --git a/rv64_zks → src/riscv_opcodes/opcodes/ratified/rv64_zks b/rv64_zks → src/riscv_opcodes/opcodes/ratified/rv64_zks
diff --git a/rv_a → src/riscv_opcodes/opcodes/ratified/rv_a b/rv_a → src/riscv_opcodes/opcodes/ratified/rv_a
diff --git a/rv_c → src/riscv_opcodes/opcodes/ratified/rv_c b/rv_c → src/riscv_opcodes/opcodes/ratified/rv_c
diff --git a/rv_c_d → src/riscv_opcodes/opcodes/ratified/rv_c_d b/rv_c_d → src/riscv_opcodes/opcodes/ratified/rv_c_d
diff --git a/rv_c_zihintntl → ...v_opcodes/opcodes/ratified/rv_c_zihintntl b/rv_c_zihintntl → ...v_opcodes/opcodes/ratified/rv_c_zihintntl
diff --git a/rv_d → src/riscv_opcodes/opcodes/ratified/rv_d b/rv_d → src/riscv_opcodes/opcodes/ratified/rv_d
diff --git a/rv_d_zfa → src/riscv_opcodes/opcodes/ratified/rv_d_zfa b/rv_d_zfa → src/riscv_opcodes/opcodes/ratified/rv_d_zfa
diff --git a/rv_d_zfh → src/riscv_opcodes/opcodes/ratified/rv_d_zfh b/rv_d_zfh → src/riscv_opcodes/opcodes/ratified/rv_d_zfh
diff --git a/rv_f → src/riscv_opcodes/opcodes/ratified/rv_f b/rv_f → src/riscv_opcodes/opcodes/ratified/rv_f
diff --git a/rv_f_zfa → src/riscv_opcodes/opcodes/ratified/rv_f_zfa b/rv_f_zfa → src/riscv_opcodes/opcodes/ratified/rv_f_zfa
diff --git a/rv_h → src/riscv_opcodes/opcodes/ratified/rv_h b/rv_h → src/riscv_opcodes/opcodes/ratified/rv_h
diff --git a/rv_i → src/riscv_opcodes/opcodes/ratified/rv_i b/rv_i → src/riscv_opcodes/opcodes/ratified/rv_i
diff --git a/rv_m → src/riscv_opcodes/opcodes/ratified/rv_m b/rv_m → src/riscv_opcodes/opcodes/ratified/rv_m
diff --git a/rv_q → src/riscv_opcodes/opcodes/ratified/rv_q b/rv_q → src/riscv_opcodes/opcodes/ratified/rv_q
diff --git a/rv_q_zfa → src/riscv_opcodes/opcodes/ratified/rv_q_zfa b/rv_q_zfa → src/riscv_opcodes/opcodes/ratified/rv_q_zfa
diff --git a/rv_q_zfh → src/riscv_opcodes/opcodes/ratified/rv_q_zfh b/rv_q_zfh → src/riscv_opcodes/opcodes/ratified/rv_q_zfh
diff --git a/rv_s → src/riscv_opcodes/opcodes/ratified/rv_s b/rv_s → src/riscv_opcodes/opcodes/ratified/rv_s
diff --git a/rv_sdext → src/riscv_opcodes/opcodes/ratified/rv_sdext b/rv_sdext → src/riscv_opcodes/opcodes/ratified/rv_sdext
diff --git a/rv_svinval → ...riscv_opcodes/opcodes/ratified/rv_svinval b/rv_svinval → ...riscv_opcodes/opcodes/ratified/rv_svinval
diff --git a/rv_system → src/riscv_opcodes/opcodes/ratified/rv_system b/rv_system → src/riscv_opcodes/opcodes/ratified/rv_system
diff --git a/rv_v → src/riscv_opcodes/opcodes/ratified/rv_v b/rv_v → src/riscv_opcodes/opcodes/ratified/rv_v
diff --git a/rv_v_aliases → ...scv_opcodes/opcodes/ratified/rv_v_aliases b/rv_v_aliases → ...scv_opcodes/opcodes/ratified/rv_v_aliases
diff --git a/rv_zabha → src/riscv_opcodes/opcodes/ratified/rv_zabha b/rv_zabha → src/riscv_opcodes/opcodes/ratified/rv_zabha
diff --git a/rv_zacas → src/riscv_opcodes/opcodes/ratified/rv_zacas b/rv_zacas → src/riscv_opcodes/opcodes/ratified/rv_zacas
diff --git a/rv_zawrs → src/riscv_opcodes/opcodes/ratified/rv_zawrs b/rv_zawrs → src/riscv_opcodes/opcodes/ratified/rv_zawrs
diff --git a/rv_zba → src/riscv_opcodes/opcodes/ratified/rv_zba b/rv_zba → src/riscv_opcodes/opcodes/ratified/rv_zba
diff --git a/rv_zbb → src/riscv_opcodes/opcodes/ratified/rv_zbb b/rv_zbb → src/riscv_opcodes/opcodes/ratified/rv_zbb
diff --git a/rv_zbc → src/riscv_opcodes/opcodes/ratified/rv_zbc b/rv_zbc → src/riscv_opcodes/opcodes/ratified/rv_zbc
diff --git a/rv_zbkb → src/riscv_opcodes/opcodes/ratified/rv_zbkb b/rv_zbkb → src/riscv_opcodes/opcodes/ratified/rv_zbkb
diff --git a/rv_zbkc → src/riscv_opcodes/opcodes/ratified/rv_zbkc b/rv_zbkc → src/riscv_opcodes/opcodes/ratified/rv_zbkc
diff --git a/rv_zbkx → src/riscv_opcodes/opcodes/ratified/rv_zbkx b/rv_zbkx → src/riscv_opcodes/opcodes/ratified/rv_zbkx
diff --git a/rv_zbs → src/riscv_opcodes/opcodes/ratified/rv_zbs b/rv_zbs → src/riscv_opcodes/opcodes/ratified/rv_zbs
diff --git a/rv_zcb → src/riscv_opcodes/opcodes/ratified/rv_zcb b/rv_zcb → src/riscv_opcodes/opcodes/ratified/rv_zcb
diff --git a/rv_zcmop → src/riscv_opcodes/opcodes/ratified/rv_zcmop b/rv_zcmop → src/riscv_opcodes/opcodes/ratified/rv_zcmop
diff --git a/rv_zcmp → src/riscv_opcodes/opcodes/ratified/rv_zcmp b/rv_zcmp → src/riscv_opcodes/opcodes/ratified/rv_zcmp
diff --git a/rv_zcmt → src/riscv_opcodes/opcodes/ratified/rv_zcmt b/rv_zcmt → src/riscv_opcodes/opcodes/ratified/rv_zcmt
diff --git a/rv_zfh → src/riscv_opcodes/opcodes/ratified/rv_zfh b/rv_zfh → src/riscv_opcodes/opcodes/ratified/rv_zfh
diff --git a/rv_zfh_zfa → ...riscv_opcodes/opcodes/ratified/rv_zfh_zfa b/rv_zfh_zfa → ...riscv_opcodes/opcodes/ratified/rv_zfh_zfa
diff --git a/rv_zicbo → src/riscv_opcodes/opcodes/ratified/rv_zicbo b/rv_zicbo → src/riscv_opcodes/opcodes/ratified/rv_zicbo
diff --git a/rv_zicntr → src/riscv_opcodes/opcodes/ratified/rv_zicntr b/rv_zicntr → src/riscv_opcodes/opcodes/ratified/rv_zicntr
diff --git a/rv_zicond → src/riscv_opcodes/opcodes/ratified/rv_zicond b/rv_zicond → src/riscv_opcodes/opcodes/ratified/rv_zicond
diff --git a/rv_zicsr → src/riscv_opcodes/opcodes/ratified/rv_zicsr b/rv_zicsr → src/riscv_opcodes/opcodes/ratified/rv_zicsr
diff --git a/rv_zifencei → ...iscv_opcodes/opcodes/ratified/rv_zifencei b/rv_zifencei → ...iscv_opcodes/opcodes/ratified/rv_zifencei
diff --git a/rv_zihintntl → ...scv_opcodes/opcodes/ratified/rv_zihintntl b/rv_zihintntl → ...scv_opcodes/opcodes/ratified/rv_zihintntl
diff --git a/rv_zimop → src/riscv_opcodes/opcodes/ratified/rv_zimop b/rv_zimop → src/riscv_opcodes/opcodes/ratified/rv_zimop
diff --git a/rv_zk → src/riscv_opcodes/opcodes/ratified/rv_zk b/rv_zk → src/riscv_opcodes/opcodes/ratified/rv_zk
diff --git a/rv_zkn → src/riscv_opcodes/opcodes/ratified/rv_zkn b/rv_zkn → src/riscv_opcodes/opcodes/ratified/rv_zkn
diff --git a/rv_zknh → src/riscv_opcodes/opcodes/ratified/rv_zknh b/rv_zknh → src/riscv_opcodes/opcodes/ratified/rv_zknh
diff --git a/rv_zks → src/riscv_opcodes/opcodes/ratified/rv_zks b/rv_zks → src/riscv_opcodes/opcodes/ratified/rv_zks
diff --git a/rv_zksed → src/riscv_opcodes/opcodes/ratified/rv_zksed b/rv_zksed → src/riscv_opcodes/opcodes/ratified/rv_zksed
diff --git a/rv_zksh → src/riscv_opcodes/opcodes/ratified/rv_zksh b/rv_zksh → src/riscv_opcodes/opcodes/ratified/rv_zksh
diff --git a/rv_zvbb → src/riscv_opcodes/opcodes/ratified/rv_zvbb b/rv_zvbb → src/riscv_opcodes/opcodes/ratified/rv_zvbb
diff --git a/rv_zvbc → src/riscv_opcodes/opcodes/ratified/rv_zvbc b/rv_zvbc → src/riscv_opcodes/opcodes/ratified/rv_zvbc
diff --git a/rv_zvkg → src/riscv_opcodes/opcodes/ratified/rv_zvkg b/rv_zvkg → src/riscv_opcodes/opcodes/ratified/rv_zvkg
diff --git a/rv_zvkn → src/riscv_opcodes/opcodes/ratified/rv_zvkn b/rv_zvkn → src/riscv_opcodes/opcodes/ratified/rv_zvkn
diff --git a/rv_zvkned → src/riscv_opcodes/opcodes/ratified/rv_zvkned b/rv_zvkned → src/riscv_opcodes/opcodes/ratified/rv_zvkned
diff --git a/rv_zvknha → src/riscv_opcodes/opcodes/ratified/rv_zvknha b/rv_zvknha → src/riscv_opcodes/opcodes/ratified/rv_zvknha
diff --git a/rv_zvknhb → src/riscv_opcodes/opcodes/ratified/rv_zvknhb b/rv_zvknhb → src/riscv_opcodes/opcodes/ratified/rv_zvknhb
diff --git a/rv_zvks → src/riscv_opcodes/opcodes/ratified/rv_zvks b/rv_zvks → src/riscv_opcodes/opcodes/ratified/rv_zvks
diff --git a/rv_zvksed → src/riscv_opcodes/opcodes/ratified/rv_zvksed b/rv_zvksed → src/riscv_opcodes/opcodes/ratified/rv_zvksed
diff --git a/rv_zvksh → src/riscv_opcodes/opcodes/ratified/rv_zvksh b/rv_zvksh → src/riscv_opcodes/opcodes/ratified/rv_zvksh
diff --git a/unratified/rv64_zbp → ...riscv_opcodes/opcodes/unratified/rv64_zbp b/unratified/rv64_zbp → ...riscv_opcodes/opcodes/unratified/rv64_zbp
diff --git a/unratified/rv_c_zicfiss → ...v_opcodes/opcodes/unratified/rv_c_zicfiss b/unratified/rv_c_zicfiss → ...v_opcodes/opcodes/unratified/rv_c_zicfiss
diff --git a/unratified/rv_smdbltrp → ...cv_opcodes/opcodes/unratified/rv_smdbltrp b/unratified/rv_smdbltrp → ...cv_opcodes/opcodes/unratified/rv_smdbltrp
diff --git a/unratified/rv_smrnmi → ...iscv_opcodes/opcodes/unratified/rv_smrnmi b/unratified/rv_smrnmi → ...iscv_opcodes/opcodes/unratified/rv_smrnmi
diff --git a/unratified/rv_zalasr → ...iscv_opcodes/opcodes/unratified/rv_zalasr b/unratified/rv_zalasr → ...iscv_opcodes/opcodes/unratified/rv_zalasr
diff --git a/unratified/rv_zbp → src/riscv_opcodes/opcodes/unratified/rv_zbp b/unratified/rv_zbp → src/riscv_opcodes/opcodes/unratified/rv_zbp
diff --git a/unratified/rv_zfbfmin → ...scv_opcodes/opcodes/unratified/rv_zfbfmin b/unratified/rv_zfbfmin → ...scv_opcodes/opcodes/unratified/rv_zfbfmin
diff --git a/unratified/rv_zicfilp → ...scv_opcodes/opcodes/unratified/rv_zicfilp b/unratified/rv_zicfilp → ...scv_opcodes/opcodes/unratified/rv_zicfilp
diff --git a/unratified/rv_zicfiss → ...scv_opcodes/opcodes/unratified/rv_zicfiss b/unratified/rv_zicfiss → ...scv_opcodes/opcodes/unratified/rv_zicfiss
diff --git a/unratified/rv_zvfbfmin → ...cv_opcodes/opcodes/unratified/rv_zvfbfmin b/unratified/rv_zvfbfmin → ...cv_opcodes/opcodes/unratified/rv_zvfbfmin
diff --git a/unratified/rv_zvfbfwma → ...cv_opcodes/opcodes/unratified/rv_zvfbfwma b/unratified/rv_zvfbfwma → ...cv_opcodes/opcodes/unratified/rv_zvfbfwma
diff --git a/parse.py → src/riscv_opcodes/parse.py b/parse.py → src/riscv_opcodes/parse.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from constants import *
+from .constants import *
 import copy
 import re
 import glob
@@ -11,6 +11,9 @@
 import yaml
 import sys
 
+from importlib.resources import open_text, read_text, contents
+from fnmatch import fnmatch
+
 pp = pprint.PrettyPrinter(indent=2)
 logging.basicConfig(level=logging.INFO, format='%(levelname)s:: %(message)s')
 
@@ -118,7 +121,7 @@ def process_enc_line(line, ext):
                 existing_arg, new_arg = parts
                 if existing_arg in arg_lut:
                     arg_lut[a] = arg_lut[existing_arg]
-                
+
                 else:
                     logging.error(f' Found field {existing_arg} in variable {a} in instruction {name} whose mapping in arg_lut does not exist')
                     raise SystemExit(1)
@@ -242,19 +245,20 @@ def create_inst_dict(file_filter, include_pseudo=False, include_pseudo_ops=[]):
 
 
     '''
-    opcodes_dir = os.path.dirname(os.path.realpath(__file__))
     instr_dict = {}
 
     # file_names contains all files to be parsed in the riscv-opcodes directory
     file_names = []
-    for fil in file_filter:
-        file_names += glob.glob(f'{opcodes_dir}/{fil}')
+    for package in ["riscv_opcodes.opcodes.ratified", "riscv_opcodes.opcodes.unratified"]:
+        for file in contents(package):
+            if any(fnmatch(file, fil) for fil in file_filter):
+                file_names += file
     file_names.sort(reverse=True)
     # first pass if for standard/regular instructions
     logging.debug('Collecting standard instructions first')
     for f in file_names:
         logging.debug(f'Parsing File: {f} for standard instructions')
-        with open(f) as fp:
+        with open_text(f) as fp:
             lines = (line.rstrip()
                      for line in fp)  # All lines including the blank ones
             lines = list(line for line in lines if line)  # Non-blank lines
@@ -952,8 +956,7 @@ def make_c(instr_dict):
         mask = ((1 << (end - begin + 1)) - 1) << begin
         arg_str += f"#define INSN_FIELD_{sanitized_name.upper()} {hex(mask)}\n"
 
-    with open(f'{os.path.dirname(__file__)}/encoding.h', 'r') as file:
-        enc_header = file.read()
+    enc_header = read_text("riscv_opcodes", "encoding.h")
 
     commit = os.popen('git log -1 --format="format:%h"').read()
 
@@ -1027,7 +1030,7 @@ def make_go(instr_dict):
         instr_str += f'''  case A{i.upper().replace("_","")}:
     return &inst{{ {hex(opcode)}, {hex(funct3)}, {hex(rs1)}, {hex(rs2)}, {signed(csr,12)}, {hex(funct7)} }}
 '''
-        
+
     with open('inst.go','w') as file:
         file.write(prelude)
         file.write(instr_str)
@@ -1046,7 +1049,7 @@ def signed(value, width):
     return value - (1<<width)
 
 
-if __name__ == "__main__":
+def main():
     print(f'Running with args : {sys.argv}')
 
     extensions = sys.argv[1:]
@@ -1066,7 +1069,7 @@ def signed(value, width):
     instr_dict = collections.OrderedDict(sorted(instr_dict.items()))
 
     if '-c' in sys.argv[1:]:
-        instr_dict_c = create_inst_dict(extensions, False, 
+        instr_dict_c = create_inst_dict(extensions, False,
                                         include_pseudo_ops=emitted_pseudo_ops)
         instr_dict_c = collections.OrderedDict(sorted(instr_dict_c.items()))
         make_c(instr_dict_c)
@@ -1097,3 +1100,7 @@ def signed(value, width):
         logging.info('instr-table.tex generated successfully')
         make_priv_latex_table()
         logging.info('priv-instr-table.tex generated successfully')
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test.py → src/riscv_opcodes/test.py b/test.py → src/riscv_opcodes/test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from parse import *
+from .parse import *
 import logging
 import unittest