Merge branch 'main' into Ali/sverilog

Signed-off-by: Alieldin Alaa <[email protected]>

Author: AliAlaa88

.devcontainer/Dockerfile

@@ -42,4 +42,19 @@ RUN apt-get clean autoclean
 RUN apt-get autoremove -y
 RUN rm -rf /var/lib/{apt,dpkg,cache,log}/*
 
+# Create Python virtual environment and install packages
+COPY requirements.txt /tmp/requirements.txt
+RUN /usr/bin/python3 -m venv /opt/venv && \
+    /opt/venv/bin/pip install -r /tmp/requirements.txt && \
+    rm /tmp/requirements.txt
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Install npm packages globally in the container
+COPY package.json package-lock.json /opt/node/
+RUN cd /opt/node && \
+    /usr/bin/npm ci && \
+    rm /opt/node/package.json /opt/node/package-lock.json
+ENV NODE_PATH="/opt/node/node_modules"
+ENV PATH="/opt/node/node_modules/.bin:$PATH"
+
 WORKDIR /workspace

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "RISC-V UnifiedDB Dev",
-  "build": { "dockerfile": "Dockerfile" },
+  "build": { "dockerfile": "Dockerfile", "context": ".." },
   "updateContentCommand": "${containerWorkspaceFolder}/.devcontainer/updateContentCommand.sh",
   "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/onCreateCommand.sh",
   "remoteEnv": {

.devcontainer/onCreateCommand.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-npm i
 bundle install

.github/workflows/deploy.yml

@@ -316,6 +316,38 @@ jobs:
         with:
           name: ac200-crd
           path: gen/proc_crd/pdf/AC200-CRD.pdf
+  build-rvi20-32-crd:
+    if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Github Repo Action
+        uses: actions/checkout@v4
+      - name: singularity setup
+        uses: ./.github/actions/singularity-setup
+      - name: Generate RVI20-32 CRD
+        run: ./do gen:proc_crd_pdf[RVI20-32]
+      - name: Upload RVI20-32 CRD
+        uses: actions/upload-artifact@v4
+        if: (github.event_name == 'push') && (github.ref_name == 'main')
+        with:
+          name: rvi20-32-crd
+          path: gen/proc_crd/pdf/RVI20-32-CRD.pdf
+  build-rvi20-64-crd:
+    if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Github Repo Action
+        uses: actions/checkout@v4
+      - name: singularity setup
+        uses: ./.github/actions/singularity-setup
+      - name: Generate RVI20-64 CRD
+        run: ./do gen:proc_crd_pdf[RVI20-64]
+      - name: Upload RVI20-64 CRD
+        uses: actions/upload-artifact@v4
+        if: (github.event_name == 'push') && (github.ref_name == 'main')
+        with:
+          name: rvi20-64-crd
+          path: gen/proc_crd/pdf/RVI20-64-CRD.pdf
   build-mc100-32-crd:
     if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
     runs-on: ubuntu-latest

.github/workflows/pages.yml

@@ -148,6 +148,20 @@ jobs:
           path: _site/pdfs
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
+      - name: Download RVI20-32-CRD
+        uses: actions/download-artifact@v5
+        with:
+          name: RVI20-32-crd
+          path: _site/pdfs
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+      - name: Download RVI20-64-CRD
+        uses: actions/download-artifact@v5
+        with:
+          name: RVI20-64-crd
+          path: _site/pdfs
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
       - name: Download MC100-32
         uses: actions/download-artifact@v5
         with:

README.adoc

@@ -60,7 +60,7 @@ Additionally, developers will be interested in the following:
 
 === Prerequisites
 
-UnifiedDB tools are set up to run in a container. Both Docker (any version) and Singularity/Apptainer (`Singularity CE >= 3.3` or `Apptainer >= 1.0`) are supported.
+UnifiedDB tools are set up to run in a container. Docker (any version), Podman (any version), and Singularity/Apptainer (`Singularity CE >= 3.3` or `Apptainer >= 1.0`) are supported.
 
 === Devcontainer
 

Rakefile

@@ -119,7 +119,7 @@ namespace :test do
   # "Run the cross-validation against LLVM"
   task :llvm do
       begin
-        sh "#{$root}/.home/.venv/bin/python3 -m pytest ext/auto-inst/test_parsing.py -v"
+        sh "/opt/venv/bin/python3 -m pytest ext/auto-inst/test_parsing.py -v"
       rescue => e
         raise unless e.message.include?("status (5)") # don't fail on skipped tests
     end
@@ -546,6 +546,8 @@ task "RVI20-32-CTP": "#{$root}/gen/proc_ctp/pdf/RVI20-32-CTP.pdf"
 task "RVI20-64-CTP": "#{$root}/gen/proc_ctp/pdf/RVI20-64-CTP.pdf"
 task "MC100-32-CTP": "#{$root}/gen/proc_ctp/pdf/MC100-32-CTP.pdf"
 task "MC100-32-CTP-HTML": "#{$root}/gen/proc_ctp/pdf/MC100-32-CTP.html"
+task "RVI20-32-CRD": "#{$root}/gen/proc_crd/pdf/RVI20-32-CRD.pdf"
+task "RVI20-64-CRD": "#{$root}/gen/proc_crd/pdf/RVI20-64-CRD.pdf"
 task "MC100-32-CRD": "#{$root}/gen/proc_crd/pdf/MC100-32-CRD.pdf"
 task "MC100-64-CRD": "#{$root}/gen/proc_crd/pdf/MC100-64-CRD.pdf"
 task "MC200-32-CRD": "#{$root}/gen/proc_crd/pdf/MC200-32-CRD.pdf"

backends/cfg_html_doc/html_gen.rake

@@ -119,9 +119,9 @@ rule %r{#{$root}/gen/cfg_html_doc/.*/antora/playbook.yaml} => proc { |tname|
         snapshot: true
       supplemental_files:
       - path: css/vendor/tabs.css
-        contents: #{$root}/node_modules/@asciidoctor/tabs/dist/css/tabs.css
+        contents: /opt/node/node_modules/@asciidoctor/tabs/dist/css/tabs.css
       - path: js/vendor/tabs.js
-        contents: #{$root}/node_modules/@asciidoctor/tabs/dist/js/tabs.js
+        contents: /opt/node/node_modules/@asciidoctor/tabs/dist/js/tabs.js
       - path: partials/footer-scripts.hbs
         contents: |
           <script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>
@@ -234,10 +234,9 @@ rule %r{#{$root}/\.stamps/html-gen-.*\.stamp} => proc { |tname|
   playbook_path = $root / "gen" / "cfg_html_doc" / config_name / "antora" / "playbook.yaml"
   Rake::Task[playbook_path].invoke
 
-  $logger.info "Running Antora under npm to create #{config_name}"
-
+  $logger.info "Running Antora to create #{config_name}"
   sh [
-    "npm exec -- antora",
+    "/opt/node/node_modules/.bin/antora",
     "--stacktrace",
     "generate",
     "--cache-dir=#{$root}/.home/.antora",
@@ -247,7 +246,7 @@ rule %r{#{$root}/\.stamps/html-gen-.*\.stamp} => proc { |tname|
     playbook_path
   ].join(" ")
 
-  $logger.info "Done running Antora under npm to create #{config_name}"
+  $logger.info "Done running Antora to create #{config_name}"
 
   FileUtils.touch t.name
 end

backends/ext_pdf_doc/tasks.rake

@@ -34,7 +34,7 @@ rule %r{#{$resolver.gen_path}/ext_pdf_doc/.*/pdf/.*_extension\.pdf} => proc { |t
     "-a pdf-theme=#{ENV['THEME']}",
     "-a pdf-fontsdir=#{$root}/ext/docs-resources/fonts",
     "-a imagesdir=#{$root}/ext/docs-resources/images",
-    "-a wavedrom=#{$root}/node_modules/.bin/wavedrom-cli",
+    "-a wavedrom=/opt/node/node_modules/.bin/wavedrom-cli",
     "-r asciidoctor-diagram",
     "-r idl_highlighter",
     "-o #{t.name}",
@@ -63,7 +63,7 @@ rule %r{#{$resolver.gen_path}/ext_pdf_doc/.*/html/.*_extension\.html} => proc {
     "-v",
     "-a toc",
     "-r asciidoctor-diagram",
-    "-a wavedrom=#{$root}/node_modules/.bin/wavedrom-cli",
+    "-a wavedrom=/opt/node/node_modules/.bin/wavedrom-cli",
     "-o #{t.name}",
     adoc_file
   ].join(" ")

backends/generators/tasks.rake

@@ -64,9 +64,9 @@ namespace :gen do
     inst_dir = cfg_arch.path / "inst"
     csr_dir = cfg_arch.path / "csr"
 
-    # Run the Go generator script using the same Python environment
+    # Run the Go generator script
     # Note: The script uses --output not --output-dir
-    sh "#{$root}/.home/.venv/bin/python3 #{$root}/backends/generators/Go/go_generator.py --inst-dir=#{inst_dir} --csr-dir=#{csr_dir} --output=#{output_dir}inst.go"
+    sh "/opt/venv/bin/python3 #{$root}/backends/generators/Go/go_generator.py --inst-dir=#{inst_dir} --csr-dir=#{csr_dir} --output=#{output_dir}inst.go"
   end
 
   desc <<~DESC