Merge remote-tracking branch 'origin/main' into param_dep

Author: dhower-qc

.devcontainer/Dockerfile

@@ -77,4 +77,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/container.yml

@@ -6,9 +6,12 @@ on:
   workflow_dispatch:
 jobs:
   publish-singularity-container:
-    runs-on: ubuntu-latest
     env:
       SINGULARITY: 1
+    strategy:
+      matrix:
+        runner: [ubuntu-24.04, ubuntu-24.04-arm]
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Clone Github Repo Action
         uses: actions/checkout@v4

Gemfile.lock

@@ -351,7 +351,6 @@ DEPENDENCIES
   rubocop-performance
   rubocop-sorbet
   ruby-prof
-  ruby-progressbar (~> 1.13)
   simplecov
   simplecov-cobertura
   solargraph

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

@@ -120,10 +120,10 @@ 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"
-  rescue => e
-    raise unless e.message.include?("status (5)") # don't fail on skipped tests
-  end
+      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
   end
   # "Run the IDL compiler test suite"
   task :idl_compiler do

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

@@ -28,9 +28,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
@@ -79,9 +79,9 @@ namespace :gen do
     resolved_codes_file.flush
 
     begin
-      # Run the C header generator script using the same Python environment
+      # Run the C header generator script
       # The script generates encoding.h for inclusion in C programs
-      sh "#{$root}/.home/.venv/bin/python3 #{$root}/backends/generators/c_header/generate_encoding.py --inst-dir=#{inst_dir} --csr-dir=#{csr_dir} --ext-dir=#{ext_dir} --resolved-codes=#{resolved_codes_file.path} --output=#{output_dir}encoding.out.h --include-all"
+      sh "/opt/venv/bin/python3 #{$root}/backends/generators/c_header/generate_encoding.py --inst-dir=#{inst_dir} --csr-dir=#{csr_dir} --ext-dir=#{ext_dir} --resolved-codes=#{resolved_codes_file.path} --output=#{output_dir}encoding.out.h --include-all"
     ensure
       resolved_codes_file.close
       resolved_codes_file.unlink