diff --git a/functional_modeler/.clang-format b/.clang-format similarity index 100% rename from functional_modeler/.clang-format rename to .clang-format diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0a034091..0600bef0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ request, be sure to link to that issue. ## Types of changes -What types of changes does your code introduce to the HE Toolkit project? +What types of changes does your code introduce to the Encrypted Computing SDK project? _Put an `x` in the boxes that apply_ - [ ] Bugfix (non-breaking change which fixes an issue) @@ -21,7 +21,7 @@ the PR. If you are unsure about any of them, do not hesitate to ask. We are here to help! This is simply a reminder of what we are going to look for before merging your code._ -- [ ] I have read the [CONTRIBUTING](https://github.com/IntelLabs/hec-p-isa-tools/blob/main/CONTRIBUTING.md) agreement +- [ ] I have read the [CONTRIBUTING](https://github.com/IntelLabs/encrypted-computing-sdk/blob/main/CONTRIBUTING.md) agreement - [ ] Current formatting and unit tests / base functionality passes locally with my changes - [ ] I have added tests that prove my fix is effective or that my feature works (if appropriate) - [ ] I have added necessary documentation (if appropriate) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f4ca5ec4..943d7bb9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,3 +58,16 @@ repos: - -rn # Only display messages - -sn # Don't display the score - --source-roots=kerngen # Working directory + - id: clang-format-14 + name: clang-format-14 + entry: clang-format-14 + language: system + files: \.(c|cc|cxx|cpp|h|hpp|hxx|inl)$ + args: ["-i", "--style=file"] + - id: cpplint + name: cpplint + entry: cpplint + language: system + files: \.(c|cc|cxx|cpp|h|hpp|hxx)$ + args: + - --recursive diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a069ac2..36912f50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ ### License -The Intel Encrypted Computing SDK project is licensed under the terms in [LICENSE](https://github.com/IntelLabs/hec-p-isa-tools/blob/main/LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms. +The Intel Encrypted Computing SDK project is licensed under the terms in [LICENSE](https://github.com/IntelLabs/encrypted-computing-sdk/blob/main/LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms. ### Sign your work diff --git a/README.md b/README.md index 2387e167..5755bc58 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Intel P-ISA Tools project welcomes external contributions through pull requests to the `main` branch. Please refer to the [Contributing](CONTRIBUTING.md) and -[Code of Conduct](CODE_OF_CONDUCT) documents for additional information on +[Code of Conduct](CODE_OF_CONDUCT.md) documents for additional information on the contribution acceptance guidelines. We use signed commits, please remember to sign your commits before making a @@ -93,6 +93,6 @@ the tests pass. # Feedback We encourage feedback and suggestions via -[GitHub Issues](https://github.com/IntelLabs/hec-p-isa-tools/issues) as well +[GitHub Issues](https://github.com/IntelLabs/encrypted-computing-sdk/issues) as well as via -[GitHub Discussions](https://github.com/IntelLabs/hec-p-isa-tools/discussions). +[GitHub Discussions](https://github.com/IntelLabs/encrypted-computing-sdk/discussions). diff --git a/assembler_tools/empty_file.txt b/assembler_tools/empty_file.txt new file mode 100644 index 00000000..e69de29b diff --git a/functional_modeler/.pre-commit-config.yaml b/functional_modeler/.pre-commit-config.yaml deleted file mode 100644 index cd53ff25..00000000 --- a/functional_modeler/.pre-commit-config.yaml +++ /dev/null @@ -1,47 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.5.0 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - id: check-merge-conflict - - id: mixed-line-ending - - id: check-byte-order-marker - - repo: https://github.com/crate-ci/typos - rev: v1.20.9 # Updated 2024/04 - hooks: - - id: typos - - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.5.1 # Updated 2023/07 - hooks: - - id: insert-license - name: insert-license-shell - files: \.(sh|py)$ - args: - - --license-filepath - # defaults to: LICENSE.txt - - HEADER - - id: insert-license - name: insert-license-cpp - files: \.(c|cc|cxx|cpp|h|hpp|hxx|inl|h.in)$ - args: - - --license-filepath - # defaults to: LICENSE.txt - - HEADER - - --comment-style - - // # defaults to: # - - repo: local - hooks: - - id: clang-format-14 - name: clang-format-14 - entry: clang-format-14 - language: system - files: \.(c|cc|cxx|cpp|h|hpp|hxx|inl)$ - args: ["-i", "--style=file"] - - id: cpplint - name: cpplint - entry: cpplint - language: system - files: \.(c|cc|cxx|cpp|h|hpp|hxx)$ - args: - - --recursive diff --git a/functional_modeler/CMakeLists.txt b/p-isa_tools/CMakeLists.txt similarity index 100% rename from functional_modeler/CMakeLists.txt rename to p-isa_tools/CMakeLists.txt diff --git a/functional_modeler/CPPLINT.cfg b/p-isa_tools/CPPLINT.cfg similarity index 100% rename from functional_modeler/CPPLINT.cfg rename to p-isa_tools/CPPLINT.cfg diff --git a/functional_modeler/cmake/dependencies.cmake b/p-isa_tools/cmake/dependencies.cmake similarity index 100% rename from functional_modeler/cmake/dependencies.cmake rename to p-isa_tools/cmake/dependencies.cmake diff --git a/functional_modeler/common/CMakeLists.txt b/p-isa_tools/common/CMakeLists.txt similarity index 100% rename from functional_modeler/common/CMakeLists.txt rename to p-isa_tools/common/CMakeLists.txt diff --git a/functional_modeler/common/config.h.in b/p-isa_tools/common/config.h.in similarity index 100% rename from functional_modeler/common/config.h.in rename to p-isa_tools/common/config.h.in diff --git a/functional_modeler/common/graph/graph.h b/p-isa_tools/common/graph/graph.h similarity index 100% rename from functional_modeler/common/graph/graph.h rename to p-isa_tools/common/graph/graph.h diff --git a/functional_modeler/common/p_isa/isa_instruction.h b/p-isa_tools/common/p_isa/isa_instruction.h similarity index 100% rename from functional_modeler/common/p_isa/isa_instruction.h rename to p-isa_tools/common/p_isa/isa_instruction.h diff --git a/functional_modeler/common/p_isa/p_isa.h b/p-isa_tools/common/p_isa/p_isa.h similarity index 100% rename from functional_modeler/common/p_isa/p_isa.h rename to p-isa_tools/common/p_isa/p_isa.h diff --git a/functional_modeler/common/p_isa/p_isa_hardware_models.h b/p-isa_tools/common/p_isa/p_isa_hardware_models.h similarity index 100% rename from functional_modeler/common/p_isa/p_isa_hardware_models.h rename to p-isa_tools/common/p_isa/p_isa_hardware_models.h diff --git a/functional_modeler/common/p_isa/p_isa_instruction.cpp b/p-isa_tools/common/p_isa/p_isa_instruction.cpp similarity index 100% rename from functional_modeler/common/p_isa/p_isa_instruction.cpp rename to p-isa_tools/common/p_isa/p_isa_instruction.cpp diff --git a/functional_modeler/common/p_isa/p_isa_instruction.h b/p-isa_tools/common/p_isa/p_isa_instruction.h similarity index 100% rename from functional_modeler/common/p_isa/p_isa_instruction.h rename to p-isa_tools/common/p_isa/p_isa_instruction.h diff --git a/functional_modeler/common/p_isa/p_isa_instructions.h b/p-isa_tools/common/p_isa/p_isa_instructions.h similarity index 100% rename from functional_modeler/common/p_isa/p_isa_instructions.h rename to p-isa_tools/common/p_isa/p_isa_instructions.h diff --git a/functional_modeler/common/p_isa/p_isa_performance_modeler.cpp b/p-isa_tools/common/p_isa/p_isa_performance_modeler.cpp similarity index 100% rename from functional_modeler/common/p_isa/p_isa_performance_modeler.cpp rename to p-isa_tools/common/p_isa/p_isa_performance_modeler.cpp diff --git a/functional_modeler/common/p_isa/p_isa_performance_modeler.h b/p-isa_tools/common/p_isa/p_isa_performance_modeler.h similarity index 100% rename from functional_modeler/common/p_isa/p_isa_performance_modeler.h rename to p-isa_tools/common/p_isa/p_isa_performance_modeler.h diff --git a/functional_modeler/common/p_isa/parser/p_isa_parser.cpp b/p-isa_tools/common/p_isa/parser/p_isa_parser.cpp similarity index 100% rename from functional_modeler/common/p_isa/parser/p_isa_parser.cpp rename to p-isa_tools/common/p_isa/parser/p_isa_parser.cpp diff --git a/functional_modeler/common/p_isa/parser/p_isa_parser.h b/p-isa_tools/common/p_isa/parser/p_isa_parser.h similarity index 100% rename from functional_modeler/common/p_isa/parser/p_isa_parser.h rename to p-isa_tools/common/p_isa/parser/p_isa_parser.h diff --git a/functional_modeler/common/string.h b/p-isa_tools/common/string.h similarity index 100% rename from functional_modeler/common/string.h rename to p-isa_tools/common/string.h diff --git a/functional_modeler/common/timer/timer.h b/p-isa_tools/common/timer/timer.h similarity index 100% rename from functional_modeler/common/timer/timer.h rename to p-isa_tools/common/timer/timer.h diff --git a/functional_modeler/docs/doxyfile.in b/p-isa_tools/docs/doxyfile.in similarity index 100% rename from functional_modeler/docs/doxyfile.in rename to p-isa_tools/docs/doxyfile.in diff --git a/functional_modeler/docs/srcs/p_isa_instruction_set.md b/p-isa_tools/docs/srcs/p_isa_instruction_set.md similarity index 100% rename from functional_modeler/docs/srcs/p_isa_instruction_set.md rename to p-isa_tools/docs/srcs/p_isa_instruction_set.md diff --git a/functional_modeler/functional_modeler/CMakeLists.txt b/p-isa_tools/functional_modeler/CMakeLists.txt similarity index 100% rename from functional_modeler/functional_modeler/CMakeLists.txt rename to p-isa_tools/functional_modeler/CMakeLists.txt diff --git a/functional_modeler/functional_modeler/README.md b/p-isa_tools/functional_modeler/README.md similarity index 97% rename from functional_modeler/functional_modeler/README.md rename to p-isa_tools/functional_modeler/README.md index fd9c0205..9c37302a 100644 --- a/functional_modeler/functional_modeler/README.md +++ b/p-isa_tools/functional_modeler/README.md @@ -1,136 +1,136 @@ -# HERACLES P-ISA Functional Modeler - -## Table of Contents -1. [Requirements](#requirements) -2. [Build Configuration](#build-configuration) - 1. [Build Type](#build-type) - 1. [Third-Party Components](#third--party-components) -3. [Building](#building) -4. [Running the Functional Modeler](#running-the-functional-modeler) -5. [Running the Program Mapper](#running-the-program-mapper) - 1. [Scripts](#scripts) -6. [Code Formatting](#code-formatting) - - -## P-ISA Documentation -Here is some documentation on the [P-ISA Instruction Set] (@ref PISA_overview) - -## Requirements - -Current build system uses `CMake`. - -Tested Configuration(s) -- Ubuntu 22.04 (also tested on WSL2) -- C++17 -- GCC == 11.3 -- CMake >= 3.22.1 -- SNAP (used to support graph features) -- graphviz (used for graph rendering) -- JSON for Modern CPP >= 3.11 - -## Build Configuration - -The current build system is minimally configurable but will be improved with -time. The project directory is laid out as follows - -- __functional_modeler__ *src directory for the functional modeler* -- __common__ *Common code used by p-isa tools* - -### Build Options -The Follow options can be specified as cmake defines to enable / disable building of project components - - ENABLE_DATA_FORMATS="ON" - - ENABLE_FUNCTIONAL_MODELER="ON" - - ENABLE_PROGRAM_MAPPER="ON" - - ENABLE_P_ISA_UTILITIES="ON" - -### Build Type - -If no build type is specified, the build system will build in Debug -mode. Use `-DCMAKE_BUILD_TYPE` configuration variable to set your preferred -build type: - -- `-DCMAKE_BUILD_TYPE=Debug` : debug mode (default if no build type is specified). -- `-DCMAKE_BUILD_TYPE=Release` : release mode. Compiler optimizations for release enabled. -- `-DCMAKE_BUILD_TYPE=RelWithDebInfo` : release mode with debug symbols. -- `-DCMAKE_BUILD_TYPE=MinSizeRel` : release mode optimized for size. - -#### Third-Party Components -This backend requires the following third party components: - -- [SNAP](https://github.com/snap-stanford/snap.git) -- [JSON for modern c++](https://github.com/nlohmann/json) - -These external dependencies are fetched and built at configuration time by -`cmake`, see below how to build the project. - -## Building -Build from the top level of P-ISA-Functional-modeler with Cmake as follows: - -```bash -cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -cmake --build build -j -``` - -Build type can also be changed to `Debug` depending on current needs (Debug -should be used if the tool is being used to actively debug failing kernels). - -## Running the Functional Modeler - -Once `make` completes the you will find an executable in `build/bin` called -**functional_modeler**. This program can be used to functionally test p-isa -kernels against a seal trace, render p-isa kernels into a visible graph, and -debug kernel execution. -The program accepts a number of commandline options to control its usage. - -A standard test is of the form -```bash -./functional_modeler --strace -``` -For example - -```bash -functional_modeler p_isa_ops/t.2.add.14.csv --strace traces/add_16384_l2_m3_v0.json -``` - -performs a functional check for a 16k poly mod add operation checked against a -seal trace containing inputs and outputs. - -The full list of currently supported options are listed below. -```bash -Usage: - functional_modeler p_isa_op OPTIONS - -POSITIONAL ARGUMENTS: 1 -p_isa_op - Location of a file containing a list in CSV format for p_isa instructions - -OPTIONS: - --json_data, --json, -jd Location of a json data file containing HEC formatted data - --input_memory_file, --imem, -im Location of a memory file to be read and set as input before executing any instructions - --output_memory_file, --omem, -om Location to write a memory file containing all device memory after all instructions have been executed - --program_inputs_file, --pif, -if Location to a file containing program inputs in csv format. Loaded after any memory file(s) and data file but before execution - --program_outputs_file, --pof, -of Location to write a file containing program outputs in csv format. Written after program execution - --graph_file_name, --gn, -gf Sets the name of the file for the output graph image [ default=.png ] - --hardware_model, -hwm Available hardware models - (HEC-relaxed-mem,HEC-strict-mem,example) - --hec_dataformats_data, --hdd, -hd Location of HEC data-formats data manifest file - --hec_dataformats_poly_program_location, --hdp, -pp Location of HEC data-formats poly program file - --verbose, -v Enables more verbose execution reporting to stdout - --render_graph, -rg Enables rendering of p_isa graph in PNG and DOT file formats - --export_inputs, -ei Exports program inputs file to the file specified by --program_inputs_file or program_inputs.csv if none specified - --advanced_performance_analysis, -apa Enables advanced performance analysis and cycle count prediction - --verbose_output_checking, -voc Enables functional validation of functional execution - --validate_intermediate_results, -vir Enables functional validation of intermediates - if --disable_function_validation, this will be automatically set to false - --enable_advanced_debug_tracing, -dt Enables advanced debug execution and tracing. Warning: May significantly increase memory usage and reduce performance - --hec_dataformats_mode, --hdfm, -hm Uses hec data-formats execution pipeline - --disable_graphs, --graphs, -g Disables graph building and features - --disable_functional_execution, --nofunctional Disable functional execution of instruction stream - --disable_functional_validation, --novalidate, -nfv Disables functional validation of functional execution - --h, /h, \h, --help, /help, \help - Shows this help. -``` - -## Code Formatting -The repository includes `pre-commit` and `clang-format` hooks to help ensure -code consistency. It is recommended to install `pre-commit` and `pre-commit -hooks` prior to committing to repo. +# HERACLES P-ISA Functional Modeler + +## Table of Contents +1. [Requirements](#requirements) +2. [Build Configuration](#build-configuration) + 1. [Build Type](#build-type) + 1. [Third-Party Components](#third--party-components) +3. [Building](#building) +4. [Running the Functional Modeler](#running-the-functional-modeler) +5. [Running the Program Mapper](#running-the-program-mapper) + 1. [Scripts](#scripts) +6. [Code Formatting](#code-formatting) + + +## P-ISA Documentation +Here is some documentation on the [P-ISA Instruction Set] (@ref PISA_overview) + +## Requirements + +Current build system uses `CMake`. + +Tested Configuration(s) +- Ubuntu 22.04 (also tested on WSL2) +- C++17 +- GCC == 11.3 +- CMake >= 3.22.1 +- SNAP (used to support graph features) +- graphviz (used for graph rendering) +- JSON for Modern CPP >= 3.11 + +## Build Configuration + +The current build system is minimally configurable but will be improved with +time. The project directory is laid out as follows + +- __functional_modeler__ *src directory for the functional modeler* +- __common__ *Common code used by p-isa tools* + +### Build Options +The Follow options can be specified as cmake defines to enable / disable building of project components + - ENABLE_DATA_FORMATS="ON" + - ENABLE_FUNCTIONAL_MODELER="ON" + - ENABLE_PROGRAM_MAPPER="ON" + - ENABLE_P_ISA_UTILITIES="ON" + +### Build Type + +If no build type is specified, the build system will build in Debug +mode. Use `-DCMAKE_BUILD_TYPE` configuration variable to set your preferred +build type: + +- `-DCMAKE_BUILD_TYPE=Debug` : debug mode (default if no build type is specified). +- `-DCMAKE_BUILD_TYPE=Release` : release mode. Compiler optimizations for release enabled. +- `-DCMAKE_BUILD_TYPE=RelWithDebInfo` : release mode with debug symbols. +- `-DCMAKE_BUILD_TYPE=MinSizeRel` : release mode optimized for size. + +#### Third-Party Components +This backend requires the following third party components: + +- [SNAP](https://github.com/snap-stanford/snap.git) +- [JSON for modern c++](https://github.com/nlohmann/json) + +These external dependencies are fetched and built at configuration time by +`cmake`, see below how to build the project. + +## Building +Build from the top level of P-ISA-Functional-modeler with Cmake as follows: + +```bash +cmake -S . -B build -DCMAKE_BUILD_TYPE=Release +cmake --build build -j +``` + +Build type can also be changed to `Debug` depending on current needs (Debug +should be used if the tool is being used to actively debug failing kernels). + +## Running the Functional Modeler + +Once `make` completes the you will find an executable in `build/bin` called +**functional_modeler**. This program can be used to functionally test p-isa +kernels against a seal trace, render p-isa kernels into a visible graph, and +debug kernel execution. +The program accepts a number of commandline options to control its usage. + +A standard test is of the form +```bash +./functional_modeler --strace +``` +For example + +```bash +functional_modeler p_isa_ops/t.2.add.14.csv --strace traces/add_16384_l2_m3_v0.json +``` + +performs a functional check for a 16k poly mod add operation checked against a +seal trace containing inputs and outputs. + +The full list of currently supported options are listed below. +```bash +Usage: + functional_modeler p_isa_op OPTIONS + +POSITIONAL ARGUMENTS: 1 +p_isa_op + Location of a file containing a list in CSV format for p_isa instructions + +OPTIONS: + --json_data, --json, -jd Location of a json data file containing HEC formatted data + --input_memory_file, --imem, -im Location of a memory file to be read and set as input before executing any instructions + --output_memory_file, --omem, -om Location to write a memory file containing all device memory after all instructions have been executed + --program_inputs_file, --pif, -if Location to a file containing program inputs in csv format. Loaded after any memory file(s) and data file but before execution + --program_outputs_file, --pof, -of Location to write a file containing program outputs in csv format. Written after program execution + --graph_file_name, --gn, -gf Sets the name of the file for the output graph image [ default=.png ] + --hardware_model, -hwm Available hardware models - (HEC-relaxed-mem,HEC-strict-mem,example) + --hec_dataformats_data, --hdd, -hd Location of HEC data-formats data manifest file + --hec_dataformats_poly_program_location, --hdp, -pp Location of HEC data-formats poly program file + --verbose, -v Enables more verbose execution reporting to stdout + --render_graph, -rg Enables rendering of p_isa graph in PNG and DOT file formats + --export_inputs, -ei Exports program inputs file to the file specified by --program_inputs_file or program_inputs.csv if none specified + --advanced_performance_analysis, -apa Enables advanced performance analysis and cycle count prediction + --verbose_output_checking, -voc Enables functional validation of functional execution + --validate_intermediate_results, -vir Enables functional validation of intermediates - if --disable_function_validation, this will be automatically set to false + --enable_advanced_debug_tracing, -dt Enables advanced debug execution and tracing. Warning: May significantly increase memory usage and reduce performance + --hec_dataformats_mode, --hdfm, -hm Uses hec data-formats execution pipeline + --disable_graphs, --graphs, -g Disables graph building and features + --disable_functional_execution, --nofunctional Disable functional execution of instruction stream + --disable_functional_validation, --novalidate, -nfv Disables functional validation of functional execution + +-h, /h, \h, --help, /help, \help + Shows this help. +``` + +## Code Formatting +The repository includes `pre-commit` and `clang-format` hooks to help ensure +code consistency. It is recommended to install `pre-commit` and `pre-commit +hooks` prior to committing to repo. diff --git a/functional_modeler/functional_modeler/data_handlers/hec_dataformats_handler.h b/p-isa_tools/functional_modeler/data_handlers/hec_dataformats_handler.h similarity index 100% rename from functional_modeler/functional_modeler/data_handlers/hec_dataformats_handler.h rename to p-isa_tools/functional_modeler/data_handlers/hec_dataformats_handler.h diff --git a/functional_modeler/functional_modeler/data_handlers/json_data_handler.h b/p-isa_tools/functional_modeler/data_handlers/json_data_handler.h similarity index 100% rename from functional_modeler/functional_modeler/data_handlers/json_data_handler.h rename to p-isa_tools/functional_modeler/data_handlers/json_data_handler.h diff --git a/functional_modeler/functional_modeler/functional_models/multiregister.h b/p-isa_tools/functional_modeler/functional_models/multiregister.h similarity index 100% rename from functional_modeler/functional_modeler/functional_models/multiregister.h rename to p-isa_tools/functional_modeler/functional_models/multiregister.h diff --git a/functional_modeler/functional_modeler/functional_models/p_isa_functional_model.h b/p-isa_tools/functional_modeler/functional_models/p_isa_functional_model.h similarity index 100% rename from functional_modeler/functional_modeler/functional_models/p_isa_functional_model.h rename to p-isa_tools/functional_modeler/functional_models/p_isa_functional_model.h diff --git a/functional_modeler/functional_modeler/functional_models/p_isa_memory_model.h b/p-isa_tools/functional_modeler/functional_models/p_isa_memory_model.h similarity index 100% rename from functional_modeler/functional_modeler/functional_models/p_isa_memory_model.h rename to p-isa_tools/functional_modeler/functional_models/p_isa_memory_model.h diff --git a/functional_modeler/functional_modeler/functional_models/utility_functions.h b/p-isa_tools/functional_modeler/functional_models/utility_functions.h similarity index 100% rename from functional_modeler/functional_modeler/functional_models/utility_functions.h rename to p-isa_tools/functional_modeler/functional_models/utility_functions.h diff --git a/functional_modeler/functional_modeler/main.cpp b/p-isa_tools/functional_modeler/main.cpp similarity index 100% rename from functional_modeler/functional_modeler/main.cpp rename to p-isa_tools/functional_modeler/main.cpp diff --git a/functional_modeler/functional_modeler/pisa_runtime/p_isa_instruction_trace.h b/p-isa_tools/functional_modeler/pisa_runtime/p_isa_instruction_trace.h similarity index 100% rename from functional_modeler/functional_modeler/pisa_runtime/p_isa_instruction_trace.h rename to p-isa_tools/functional_modeler/pisa_runtime/p_isa_instruction_trace.h diff --git a/functional_modeler/functional_modeler/pisa_runtime/pisaprogramruntime.h b/p-isa_tools/functional_modeler/pisa_runtime/pisaprogramruntime.h similarity index 100% rename from functional_modeler/functional_modeler/pisa_runtime/pisaprogramruntime.h rename to p-isa_tools/functional_modeler/pisa_runtime/pisaprogramruntime.h diff --git a/kerngen/.gitignore b/p-isa_tools/kerngen/.gitignore similarity index 100% rename from kerngen/.gitignore rename to p-isa_tools/kerngen/.gitignore diff --git a/kerngen/README.md b/p-isa_tools/kerngen/README.md similarity index 100% rename from kerngen/README.md rename to p-isa_tools/kerngen/README.md diff --git a/kerngen/__init__.py b/p-isa_tools/kerngen/__init__.py similarity index 100% rename from kerngen/__init__.py rename to p-isa_tools/kerngen/__init__.py diff --git a/kerngen/high_parser/__init__.py b/p-isa_tools/kerngen/high_parser/__init__.py similarity index 100% rename from kerngen/high_parser/__init__.py rename to p-isa_tools/kerngen/high_parser/__init__.py diff --git a/kerngen/high_parser/config.py b/p-isa_tools/kerngen/high_parser/config.py similarity index 100% rename from kerngen/high_parser/config.py rename to p-isa_tools/kerngen/high_parser/config.py diff --git a/kerngen/high_parser/generators.py b/p-isa_tools/kerngen/high_parser/generators.py similarity index 100% rename from kerngen/high_parser/generators.py rename to p-isa_tools/kerngen/high_parser/generators.py diff --git a/kerngen/high_parser/options_handler.py b/p-isa_tools/kerngen/high_parser/options_handler.py similarity index 100% rename from kerngen/high_parser/options_handler.py rename to p-isa_tools/kerngen/high_parser/options_handler.py diff --git a/kerngen/high_parser/parser.py b/p-isa_tools/kerngen/high_parser/parser.py similarity index 100% rename from kerngen/high_parser/parser.py rename to p-isa_tools/kerngen/high_parser/parser.py diff --git a/kerngen/high_parser/pisa_operations.py b/p-isa_tools/kerngen/high_parser/pisa_operations.py similarity index 100% rename from kerngen/high_parser/pisa_operations.py rename to p-isa_tools/kerngen/high_parser/pisa_operations.py diff --git a/kerngen/high_parser/types.py b/p-isa_tools/kerngen/high_parser/types.py similarity index 100% rename from kerngen/high_parser/types.py rename to p-isa_tools/kerngen/high_parser/types.py diff --git a/kerngen/kerngen.py b/p-isa_tools/kerngen/kerngen.py old mode 100755 new mode 100644 similarity index 100% rename from kerngen/kerngen.py rename to p-isa_tools/kerngen/kerngen.py diff --git a/kerngen/pisa_generators/__init__.py b/p-isa_tools/kerngen/pisa_generators/__init__.py similarity index 100% rename from kerngen/pisa_generators/__init__.py rename to p-isa_tools/kerngen/pisa_generators/__init__.py diff --git a/kerngen/pisa_generators/basic.py b/p-isa_tools/kerngen/pisa_generators/basic.py similarity index 100% rename from kerngen/pisa_generators/basic.py rename to p-isa_tools/kerngen/pisa_generators/basic.py diff --git a/kerngen/pisa_generators/decomp.py b/p-isa_tools/kerngen/pisa_generators/decomp.py similarity index 100% rename from kerngen/pisa_generators/decomp.py rename to p-isa_tools/kerngen/pisa_generators/decomp.py diff --git a/kerngen/pisa_generators/manifest.json b/p-isa_tools/kerngen/pisa_generators/manifest.json similarity index 100% rename from kerngen/pisa_generators/manifest.json rename to p-isa_tools/kerngen/pisa_generators/manifest.json diff --git a/kerngen/pisa_generators/mod.py b/p-isa_tools/kerngen/pisa_generators/mod.py similarity index 100% rename from kerngen/pisa_generators/mod.py rename to p-isa_tools/kerngen/pisa_generators/mod.py diff --git a/kerngen/pisa_generators/ntt.py b/p-isa_tools/kerngen/pisa_generators/ntt.py similarity index 100% rename from kerngen/pisa_generators/ntt.py rename to p-isa_tools/kerngen/pisa_generators/ntt.py diff --git a/kerngen/pisa_generators/relin.py b/p-isa_tools/kerngen/pisa_generators/relin.py similarity index 100% rename from kerngen/pisa_generators/relin.py rename to p-isa_tools/kerngen/pisa_generators/relin.py diff --git a/kerngen/pisa_generators/rescale.py b/p-isa_tools/kerngen/pisa_generators/rescale.py similarity index 100% rename from kerngen/pisa_generators/rescale.py rename to p-isa_tools/kerngen/pisa_generators/rescale.py diff --git a/kerngen/pisa_generators/rotate.py b/p-isa_tools/kerngen/pisa_generators/rotate.py similarity index 100% rename from kerngen/pisa_generators/rotate.py rename to p-isa_tools/kerngen/pisa_generators/rotate.py diff --git a/kerngen/pisa_generators/square.py b/p-isa_tools/kerngen/pisa_generators/square.py similarity index 100% rename from kerngen/pisa_generators/square.py rename to p-isa_tools/kerngen/pisa_generators/square.py diff --git a/kerngen/requirements.txt b/p-isa_tools/kerngen/requirements.txt similarity index 100% rename from kerngen/requirements.txt rename to p-isa_tools/kerngen/requirements.txt diff --git a/kerngen/tests/test_kerngen.py b/p-isa_tools/kerngen/tests/test_kerngen.py similarity index 100% rename from kerngen/tests/test_kerngen.py rename to p-isa_tools/kerngen/tests/test_kerngen.py diff --git a/kerngen/vsc_kerlang_extension/.vscodeignore b/p-isa_tools/kerngen/vsc_kerlang_extension/.vscodeignore similarity index 100% rename from kerngen/vsc_kerlang_extension/.vscodeignore rename to p-isa_tools/kerngen/vsc_kerlang_extension/.vscodeignore diff --git a/kerngen/vsc_kerlang_extension/LICENSE b/p-isa_tools/kerngen/vsc_kerlang_extension/LICENSE similarity index 100% rename from kerngen/vsc_kerlang_extension/LICENSE rename to p-isa_tools/kerngen/vsc_kerlang_extension/LICENSE diff --git a/kerngen/vsc_kerlang_extension/README.md b/p-isa_tools/kerngen/vsc_kerlang_extension/README.md similarity index 100% rename from kerngen/vsc_kerlang_extension/README.md rename to p-isa_tools/kerngen/vsc_kerlang_extension/README.md diff --git a/kerngen/vsc_kerlang_extension/grammars/kerlang.tmLanguage.json b/p-isa_tools/kerngen/vsc_kerlang_extension/grammars/kerlang.tmLanguage.json similarity index 100% rename from kerngen/vsc_kerlang_extension/grammars/kerlang.tmLanguage.json rename to p-isa_tools/kerngen/vsc_kerlang_extension/grammars/kerlang.tmLanguage.json diff --git a/kerngen/vsc_kerlang_extension/heracles-kerlang-syntax-0.0.1.vsix b/p-isa_tools/kerngen/vsc_kerlang_extension/heracles-kerlang-syntax-0.0.1.vsix similarity index 100% rename from kerngen/vsc_kerlang_extension/heracles-kerlang-syntax-0.0.1.vsix rename to p-isa_tools/kerngen/vsc_kerlang_extension/heracles-kerlang-syntax-0.0.1.vsix diff --git a/kerngen/vsc_kerlang_extension/language-configuration.json b/p-isa_tools/kerngen/vsc_kerlang_extension/language-configuration.json similarity index 100% rename from kerngen/vsc_kerlang_extension/language-configuration.json rename to p-isa_tools/kerngen/vsc_kerlang_extension/language-configuration.json diff --git a/kerngen/vsc_kerlang_extension/package.json b/p-isa_tools/kerngen/vsc_kerlang_extension/package.json similarity index 100% rename from kerngen/vsc_kerlang_extension/package.json rename to p-isa_tools/kerngen/vsc_kerlang_extension/package.json diff --git a/kerngen/vsc_kerlang_extension/themes/kerlang.tmTheme.json b/p-isa_tools/kerngen/vsc_kerlang_extension/themes/kerlang.tmTheme.json similarity index 100% rename from kerngen/vsc_kerlang_extension/themes/kerlang.tmTheme.json rename to p-isa_tools/kerngen/vsc_kerlang_extension/themes/kerlang.tmTheme.json