riscv
diff --git a/‎.github/workflows/clarification.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/clarification.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/isa-build.yml‎
Lines changed: 31 additions & 4 deletions b/‎.github/workflows/isa-build.yml‎
Lines changed: 31 additions & 4 deletions
diff --git a/‎.github/workflows/pre-commit.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/pre-commit.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile‎
Lines changed: 27 additions & 9 deletions b/‎Makefile‎
Lines changed: 27 additions & 9 deletions
diff --git a/‎docs-resources‎ b/‎docs-resources‎
diff --git a/‎normative_rule_defs/bfloat16.yaml‎
Lines changed: 35 additions & 0 deletions b/‎normative_rule_defs/bfloat16.yaml‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎normative_rule_defs/c-st-ext.yaml‎
Lines changed: 151 additions & 0 deletions b/‎normative_rule_defs/c-st-ext.yaml‎
Lines changed: 151 additions & 0 deletions
@@ -12,7 +12,7 @@ jobs:
     if: startsWith(github.event.comment.body, '/clarification')
     steps:
       - name: Add Clarification Label
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.addLabels({
 
@@ -41,7 +41,7 @@ jobs:
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
-    # Build PDF and HTML files using the container
+    # Build PDF and HTML ISA manual versions and normative rule files using the container
       - name: Build Files
         id: build_files
         run: make -j$(nproc)
@@ -100,6 +100,24 @@ jobs:
           path: ${{ github.workspace }}/build/riscv-unprivileged.epub
           retention-days: 7
 
+    # Upload norm-rules.html
+      - name: Upload norm-rules.html
+        if: steps.build_files.outcome == 'success'
+        uses: actions/upload-artifact@v6
+        with:
+          name: norm-rules-${{ env.SHORT_SHA }}.html
+          path: ${{ github.workspace }}/build/norm-rules.html
+          retention-days: 7
+
+    # Upload norm-rules.json
+      - name: Upload norm-rules.json
+        if: steps.build_files.outcome == 'success'
+        uses: actions/upload-artifact@v6
+        with:
+          name: norm-rules-${{ env.SHORT_SHA }}.json
+          path: ${{ github.workspace }}/build/norm-rules.json
+          retention-days: 7
+
       - name: Create Release
         if: steps.build_files.outcome == 'success' && github.event_name == 'workflow_dispatch' && github.event.inputs.create_release == 'true'
         #uses: softprops/[email protected]
@@ -118,19 +136,28 @@ jobs:
             ${{ github.workspace }}/build/riscv-unprivileged.pdf
             ${{ github.workspace }}/build/riscv-unprivileged.html
             ${{ github.workspace }}/build/riscv-unprivileged.epub
+            ${{ github.workspace }}/build/norm-rules.html
+            ${{ github.workspace }}/build/norm-rules.json
         env:
           GITHUB_TOKEN: ${{ secrets.GHTOKEN }}
 
-    # Create directory structure pages sites for privileged and unprivileged specs.
+    # Create directory structure pages sites for privileged and unprivileged ISA manuals and normative rule files.
+    # Copy priv/unpriv ISA manual HTML also into norm-rules directory so hyperlinks from
+    # norm-rules.html into the ISA manual are found (matches local build).
       - name: Make GitHub pages directory
         run: |
-          mkdir -p dist/snapshot/unprivileged dist/snapshot/privileged
+          mkdir -p dist/snapshot/unprivileged dist/snapshot/privileged dist/snapshot/norm-rules
           cp build/riscv-unprivileged.html dist/snapshot/unprivileged/index.html
           cp build/riscv-privileged.html dist/snapshot/privileged/index.html
+          cp build/norm-rules.html dist/snapshot/norm-rules/index.html
+          cp build/norm-rules.html dist/snapshot/norm-rules/norm-rules.html
+          cp build/norm-rules.json dist/snapshot/norm-rules/norm-rules.json
+          cp build/riscv-unprivileged.html dist/snapshot/norm-rules/riscv-unprivileged.html
+          cp build/riscv-privileged.html dist/snapshot/norm-rules/riscv-privileged.html
         if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
 
       - name: Upload pages artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: dist
         if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
 
@@ -11,5 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/setup-python@v5
-      - uses: pre-commit/[email protected].0
+      - uses: actions/setup-python@v6
+      - uses: pre-commit/[email protected].1
@@ -99,7 +99,8 @@ DOCS_PDF := $(addprefix $(BUILD_DIR)/, $(addsuffix .pdf, $(DOCS)))
 DOCS_HTML := $(addprefix $(BUILD_DIR)/, $(addsuffix .html, $(DOCS)))
 DOCS_EPUB := $(addprefix $(BUILD_DIR)/, $(addsuffix .epub, $(DOCS)))
 DOCS_NORM_TAGS := $(addprefix $(BUILD_DIR)/, $(addsuffix $(DOC_NORM_TAG_SUFFIX), $(DOCS)))
-NORM_RULES := $(BUILD_DIR)/norm-rules.json
+NORM_RULES_JSON := $(BUILD_DIR)/norm-rules.json
+NORM_RULES_HTML := $(BUILD_DIR)/norm-rules.html
 
 ENV := LANG=C.utf8
 XTRA_ADOC_OPTS :=
@@ -108,7 +109,8 @@ ASCIIDOCTOR_PDF := $(ENV) asciidoctor-pdf
 ASCIIDOCTOR_HTML := $(ENV) asciidoctor
 ASCIIDOCTOR_EPUB := $(ENV) asciidoctor-epub3
 ASCIIDOCTOR_TAGS := $(ENV) asciidoctor --backend tags --require=./docs-resources/converters/tags.rb
-CREATE_NORM_RULE_TOOL := ruby docs-resources/tools/create_normative_rules.rb
+CREATE_NORM_RULE_TOOL := docs-resources/tools/create_normative_rules.rb
+CREATE_NORM_RULE_RUBY := ruby $(CREATE_NORM_RULE_TOOL)
 
 OPTIONS := --trace \
            -a compress \
@@ -128,7 +130,8 @@ REQUIRES := --require=asciidoctor-bibtex \
             --require=asciidoctor-mathematical \
             --require=asciidoctor-sail
 
-.PHONY: all build clean build-docs build-pdf build-html build-epub build-tags build-norm-rules docker-pull-latest
+.PHONY: all build clean build-container build-no-container build-docs build-pdf build-html build-epub build-tags docker-pull-latest submodule-check
+.PHONY: build-norm-rules build-norm-rules-json build-norm-rules-html
 
 all: build
 
@@ -143,20 +146,28 @@ build-pdf: $(DOCS_PDF)
 build-html: $(DOCS_HTML)
 build-epub: $(DOCS_EPUB)
 build-tags: $(DOCS_NORM_TAGS)
-build-norm-rules: $(NORM_RULES)
-build: build-pdf build-html build-epub build-tags build-norm-rules
+build-norm-rules-json: $(NORM_RULES_JSON)
+build-norm-rules-html: $(NORM_RULES_HTML)
+build-norm-rules: build-norm-rules-json build-norm-rules-html
+build: build-pdf build-html build-epub build-tags build-norm-rules-json build-norm-rules-html
 
 ALL_SRCS := $(shell git ls-files $(SRC_DIR))
 
-# All normative rule definition input YAML files tracked under Git (ensure you at least stage new files).
-NORM_RULE_DEF_FILES := $(shell git ls-files '$(NORM_RULE_DEF_DIR)/*.yaml')
+# All normative rule definition input YAML files.
+NORM_RULE_DEF_FILES := $(wildcard $(NORM_RULE_DEF_DIR)/*.yaml)
 
 # Add -t to each normative tag input filename and add prefix of "/" to make into absolute pathname.
 NORM_TAG_FILE_ARGS := $(foreach relative_pname,$(DOCS_NORM_TAGS),-t /$(relative_pname))
 
 # Add -d to each normative rule definition filename
 NORM_RULE_DEF_ARGS := $(foreach relative_pname,$(NORM_RULE_DEF_FILES),-d $(relative_pname))
 
+# Provide mapping from an ISA manual's norm tags JSON file to a URL that one can link to. Used to create links into ISA manual.
+NORM_RULE_DOC2URL_ARGS := $(foreach doc_name,$(DOCS),-tag2url /$(BUILD_DIR)/$(doc_name)$(DOC_NORM_TAG_SUFFIX) $(doc_name).html)
+
+# Temporarily make errors warnings. Don't check this in uncommented.
+# NORM_RULE_DEF_ARGS := $(NORM_RULE_DEF_ARGS) -w
+
 $(BUILD_DIR)/%.pdf: $(SRC_DIR)/%.adoc $(ALL_SRCS)
 	$(WORKDIR_SETUP)
 	$(DOCKER_CMD) $(DOCKER_QUOTE) $(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) $< $(DOCKER_QUOTE)
@@ -180,11 +191,18 @@ $(BUILD_DIR)/%-norm-tags.json: $(SRC_DIR)/%.adoc $(ALL_SRCS) docs-resources/conv
 	$(DOCKER_CMD) $(DOCKER_QUOTE) $(ASCIIDOCTOR_TAGS) $(OPTIONS) -a tags-match-prefix='norm:' -a tags-output-suffix='-norm-tags.json' $(REQUIRES) $< $(DOCKER_QUOTE)
 	$(WORKDIR_TEARDOWN)
 
-$(NORM_RULES): $(DOCS_NORM_TAGS) $(NORM_RULE_DEF_FILES)
+$(NORM_RULES_JSON): $(DOCS_NORM_TAGS) $(NORM_RULE_DEF_FILES) $(CREATE_NORM_RULE_TOOL)
+	$(WORKDIR_SETUP)
+	cp -f $(DOCS_NORM_TAGS) $@.workdir
+	mkdir -p $@.workdir/build
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) -j $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $(NORM_RULE_DOC2URL_ARGS) $@ $(DOCKER_QUOTE)
+	$(WORKDIR_TEARDOWN)
+
+$(NORM_RULES_HTML): $(DOCS_NORM_TAGS) $(NORM_RULE_DEF_FILES) $(CREATE_NORM_RULE_TOOL) $(DOCS_HTML)
 	$(WORKDIR_SETUP)
 	cp -f $(DOCS_NORM_TAGS) $@.workdir
 	mkdir -p $@.workdir/build
-	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_TOOL) $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $@ $(DOCKER_QUOTE)
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) -h $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $(NORM_RULE_DOC2URL_ARGS) $@ $(DOCKER_QUOTE)
 	$(WORKDIR_TEARDOWN)
 
 # Update docker image to latest
 
@@ -0,0 +1,35 @@
+---
+# yaml-language-server: $schema=../docs-resources/schemas/defs-schema.json
+
+$schema: ../docs-resources/schemas/defs-schema.json#
+
+chapter_name: Bfloat16
+
+normative_rule_definitions:
+
+  - name: fcvt-bf16-s_op
+    tags: ["norm:fcvt-bf16-s_op"]
+
+  - name: fcvt-s-bf16_op
+    tags: ["norm:fcvt-s-bf16_op"]
+
+  - name: vfncvtbf16-f-f-w_op
+    tags: ["norm:vfncvtbf16-f-f-w_op"]
+
+  - name: vfncvtbf16-f-f-w_sew_rsv
+    tags: ["norm:vfncvtbf16-f-f-w_sew_rsv"]
+
+  - name: vfwcvtbf16-f-f-v_op
+    tags: ["norm:vfwcvtbf16-f-f-v_op"]
+
+  - name: vfwcvtbf16-f-f-v_sew_rsv
+    tags: ["norm:vfwcvtbf16-f-f-v_sew_rsv"]
+
+  - name: vfwmaccbf16_vv_op
+    tags: ["norm:vfwmaccbf16_op", "norm:vfwmaccbf16_vv", "norm:bf16_subnorm"]
+
+  - name: vfwmaccbf16_vf_op
+    tags: ["norm:vfwmaccbf16_op", "norm:vfwmaccbf16_vf", "norm:bf16_subnorm"]
+
+  - names: [vfwmaccbf16_vv_sew_rsv, vfwmaccbf16_vf_sew_rsv]
+    tags: ["norm:vfwmaccbf16_sew_rsv"]
@@ -0,0 +1,151 @@
+---
+# yaml-language-server: $schema=../docs-resources/schemas/defs-schema.json
+
+chapter_name: C Extension
+
+$schema: "../docs-resources/schemas/defs-schema.json#"
+
+normative_rule_definitions:
+  - name: Zca_offsets_mul2
+    summary: compressed instruction offsets are multiples of 2
+    tags: ["norm:Zca_offsets_mul2"]
+  - name: Zca_align16
+    tags: ["norm:Zca_align16"]
+  - name: Zca_no_misaligned
+    tags: ["norm:Zca_no_misaligned"]
+  - name: Zca_regs8
+    tags: ["norm:Zca_regs8"]
+  - name: Zc_fp_regs
+    tags: ["norm:Zc_fp_regs"]
+  - name: c-lwsp_op
+    tags: ["norm:c-lwsp_op"]
+  - name: c-lwsp_rsv
+    tags: ["norm:c-lwsp_rsv"]
+  - name: c-ldsp_op
+    tags: ["norm:c-ldsp_op"]
+  - name: c-ldsp_rsv
+    tags: ["norm:c-ldsp_rsv"]
+  - name: c-flwsp_op
+    tags: ["norm:c-flwsp_op"]
+  - name: c-fldsp_op
+    tags: ["norm:c-fldsp_op"]
+  - name: c-swsp_op
+    tags: ["norm:c-swsp_op"]
+  - name: c-sdsp_op
+    tags: ["norm:c-sdsp_op"]
+  - name: c-fswsp_op
+    tags: ["norm:c-fswsp_op"]
+  - name: c-fsdwsp_op
+    tags: ["norm:c-fsdwsp_op"]
+  - name: c-lw_op
+    tags: ["norm:c-lw_op"]
+  - name: c-ld_op
+    tags: ["norm:c-ld_op"]
+  - name: c-flw_op
+    tags: ["norm:c-flw_op"]
+  - name: c-fld_op
+    tags: ["norm:c-fld_op"]
+  - name: c-sw_op
+    tags: ["norm:c-sw_op"]
+  - name: c-sd_op
+    tags: ["norm:c-sd_op"]
+  - name: c-fsw_op
+    tags: ["norm:c-fsw_op"]
+  - name: c-fsd_op
+    tags: ["norm:c-fsd_op"]
+  - name: c-j_op
+    tags: ["norm:c-j_op"]
+  - name: c-jal_op
+    tags: ["norm:c-jal_op"]
+  - name: c-jr_op
+    tags: ["norm:c-jr_op"]
+  - name: c-jr_rsv
+    tags: ["norm:c-jr_rsv"]
+  - name: c-jalr_op
+    tags: ["norm:c-jalr_op"]
+  - name: c-ebreak
+    tags: ["norm:c-jalr_ebreak"]
+  - name: c-beqz_op
+    tags: ["norm:c-beqz_op"]
+  - name: c-bnez_op
+    tags: ["norm:c-bnez_op"]
+  - name: c-li_op
+    tags: ["norm:c-li_op"]
+  - name: c-li_hint
+    tags: ["norm:c-li_hint"]
+  - name: c-lui_op
+    tags: ["norm:c-lui_op"]
+  - name: c-lui_rsv
+    tags: ["norm:c-lui_rsv"]
+  - name: c-lui_hint
+    tags: ["norm:c-lui_hint"]
+  - name: c-addi_op
+    tags: ["norm:c-addi_op"]
+  - name: c-addi_hint
+    tags: ["norm:c-addi_hint"]
+  - name: c-addi_nop
+    tags: ["norm:c-addi_nop"]
+  - name: c-addiw_op
+    tags: ["norm:c-addiw_op"]
+  - name: c-addiw_rsv
+    tags: ["norm:c-addiw_rsv"]
+  - name: c-addi16sp_op
+    tags: ["norm:c-addi16sp_op"]
+  - name: c-addi16sp_rsv
+    tags: ["norm:c-addi16sp_rsv"]
+  - name: c-addi4spn_op
+    tags: ["norm:c-addi4spn_op"]
+  - name: c-addi4spn_rsv
+    tags: ["norm:c-addi4spn_rsv"]
+  - name: c-slli_op
+    tags: ["norm:c-slli_op"]
+  - name: c-slli_hint
+    tags: ["norm:c-slli_hint"]
+  - name: c-slli_shamt5
+    tags: ["norm:c-slli_shamt5"]
+  - name: c-srli_op
+    tags: ["norm:c-srli_op"]
+  - name: c-srli_hint
+    tags: ["norm:c-srli_hint"]
+  - name: c-srli_shamt5
+    tags: ["norm:c-srli_shamt5"]
+  - name: c-srai_op
+    tags: ["norm:c-srai_op"]
+  - name: c-srai_hint
+    tags: ["norm:c-srai_op", "norm:c-srli_hint"]
+  - name: c-andi_op
+    tags: ["norm:c-andi_op"]
+  - name: c-mv_op
+    tags: ["norm:c-mv_op"]
+  - name: c-mv_jr
+    tags: ["norm:c-mv_jr"]
+  - name: c-mv_hint
+    tags: ["norm:c-mv_hint"]
+  - name: c-add_op
+    tags: ["norm:c-add_op"]
+  - name: c-add_val
+    tags: ["norm:c-add_val"]
+  - name: c-add_hint
+    tags: ["norm:c-add_hint"]
+  - name: c-and_op
+    tags: ["norm:c-and_op"]
+  - name: c-or_op
+    tags: ["norm:c-or_op"]
+  - name: c-xor_op
+    tags: ["norm:c-xor_op"]
+  - name: c-sub_op
+    tags: ["norm:c-sub_op"]
+  - name: c-addw_op
+    tags: ["norm:c-addw_op"]
+  - name: c-subw_op
+    tags: ["norm:c-subw_op"]
+  - name: Zca_illegal
+    tags: ["norm:Zca_illegal"]
+  - name: c-nop_op
+    tags: ["norm:c-nop_op"]
+  - name: c-nop_hint
+    tags: ["norm:c-nop_hint"]
+  - name: c-ebreak_op
+    tags: ["norm:c-ebreak_op"]
+  - name: Zca_hints
+    tags: ["norm:Zca_hints"]