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

Author: Derek Hower

Rakefile

@@ -41,7 +41,7 @@ def cfg_arch_for(config_name)
   end
 end
 
-file "#{$root}/.stamps/dev_gems" do |t|
+file "#{$root}/.stamps/dev_gems" => ["#{$root}/.stamps"] do |t|
   sh "bundle exec yard config --gem-install-yri"
   sh "bundle exec yard gem"
   FileUtils.touch t.name

arch/inst/Zcmp/cm.mva01s.yaml

@@ -10,6 +10,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: r1s, r2s
 encoding:
   match: 101011---11---10

arch/inst/Zcmp/cm.mvsa01.yaml

@@ -12,6 +12,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: r1s, r2s
 encoding:
   match: 101011---01---10

arch/inst/Zcmp/cm.pop.yaml

@@ -17,6 +17,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111010------10

arch/inst/Zcmp/cm.popret.yaml

@@ -17,6 +17,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111110------10

arch/inst/Zcmp/cm.popretz.yaml

@@ -17,6 +17,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: reg_list, stack_adj
 encoding:
   match: 10111100------10

arch/inst/Zcmp/cm.push.yaml

@@ -18,6 +18,10 @@ description: |
 definedBy:
   anyOf:
     - Zcmp
+excludedBy:
+  anyOf:
+    - allOf: [C, D]
+    - Zcd
 assembly: reg_list, -stack_adj
 encoding:
   match: 10111000------10

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_flags.yaml

@@ -0,0 +1,100 @@
+# yaml-language-server: $schema=../../../../schemas/ext_schema.json
+
+$schema: ext_schema.json#
+kind: extension
+name: Xqccmp
+long_name: 16-bit Push/Pop instructions and double-moves
+type: unprivileged
+versions:
+- version: "0.1.0"
+  state: development
+  ratification_date: null
+  contributors:
+  - name: Albert Yosher
+    company: Qualcomm Technologies, Inc.
+    email: [email protected]
+  - name: Derek Hower
+    company: Qualcomm Technologies, Inc.
+    email: [email protected]
+  - name: Ana Pazos
+    company: Qualcomm Technologies, Inc.
+    email: [email protected]
+  - name: James Ball
+    company: Qualcomm Technologies, Inc.
+    email: [email protected]
+  requires:
+    name: Zca
+    version: ">= 1.0.0"
+description: |
+  The Xqccmp extension is a set of instructions which may be executed as a series of existing 32-bit RISC-V instructions.
+
+  This extension reuses some encodings from _c.fsdsp_.  Therefore it is _incompatible_ with <<Zcd>>,
+  which is included when C and D extensions are both present.
+
+  NOTE: Xqccmp is primarily targeted at embedded class CPUs due to implementation complexity. Additionally, it is not compatible with architecture class profiles.
+
+  The Xqccmp extension depends on the <<Zca>> extension.
+
+  The Xqccmp extension using same encodings as Zcmp extension for similar instructions, with 2 major differences:
+
+  * Order of load and store of registers is opposite to Zcmp order, but compliant with SW ABI
+  * Xqccmp on top of Zcmp instructions defines qc.cm.pushfp instruction to manage frame pointer
+
+  The PUSH/POP assembly syntax uses several variables, the meaning of which are:
+
+  * _reg_list_ is a list containing 1 to 13 registers (ra and 0 to 12 s registers)
+  ** valid values: {ra}, {ra, s0}, {ra, s0-s1}, {ra, s0-s2}, ..., {ra, s0-s8}, {ra, s0-s9}, {ra, s0-s11}
+  ** note that {ra, s0-s10} is _not_ valid, giving 12 lists not 13 for better encoding
+  * _stack_adj_ is the total size of the stack frame.
+  ** valid values vary with register list length and the specific encoding, see the instruction pages for details.
+
+  [%header,cols="^1,^1,4,8"]
+  |===
+  |RV32
+  |RV64
+  |Mnemonic
+  |Instruction
+
+  |yes
+  |yes
+  |qc.cm.push _{reg_list}, -stack_adj_
+  |<<#insns-qc_cm_push>>
+
+  |yes
+  |yes
+  |qc.cm.pushfp _{reg_list}, -stack_adj_
+  |<<#insns-qc_cm_pushfp>>
+
+  |yes
+  |yes
+  |qc.cm.pop _{reg_list}, stack_adj_
+  |<<#insns-qc_cm_pop>>
+
+  |yes
+  |yes
+  |qc.cm.popret _{reg_list}, stack_adj_
+  |<<#insns-qc_cm_popret>>
+
+  |yes
+  |yes
+  |qc.cm.popretz _{reg_list}, stack_adj_
+  |<<#insns-qc_cm_popretz>>
+
+  |yes
+  |yes
+  |qc.cm.mva01s _rs1', rs2'_
+  |<<#insns-qc_cm_mva01s>>
+
+  |yes
+  |yes
+  |qc.cm.mvsa01 _r1s', r2s'_
+  |<<#insns-qc_cm_mvsa01>>
+
+  |===
+
+doc_license:
+  name: Creative Commons Attribution 4.0 International License
+  url: https://creativecommons.org/licenses/by/4.0/
+company:
+  name: Qualcomm Technologies, Inc.
+  url: https://qualcomm.com

cfgs/qc_iu/arch_overlay/ext/Xqccmp.yaml

@@ -149,8 +149,13 @@ versions:
   changes:
     - Fix encoding of qc.c.extu instruction
     - Fix encoding of qc.swmi instruction
+    - Fix decoding of qc.pputci instruction
+    - Fix decoding of qc.delay instruction (state that immediate cannot be 0)
     - Rename qc.slasat -> qc.shlsat
     - Rename qc.sllsat -> qc.shlusat
+    - Add requirement to include Zca extension for Xqcisim since it has 16-bit instructions
+    - Add requirement to include Zca extension for Xqcisync since it has 16-bit instructions
+    - Remove qc.flags CSR
   implies:
   - [Xqcia, "0.4.0"]
   - [Xqciac, "0.2.0"]
@@ -159,14 +164,16 @@ versions:
   - [Xqcicli, "0.2.0"]
   - [Xqcicm, "0.2.0"]
   - [Xqcics, "0.2.0"]
-  - [Xqcicsr, "0.2.0"]
+  - [Xqcicsr, "0.3.0"]
   - [Xqciint, "0.2.0"]
   - [Xqcilb, "0.2.0"]
   - [Xqcili, "0.2.0"]
   - [Xqcilia, "0.2.0"]
   - [Xqcilo, "0.2.0"]
   - [Xqcilsm, "0.4.0"]
+  - [Xqcisim, "0.2.0"]
   - [Xqcisls, "0.2.0"]
+  - [Xqcisync, "0.2.0"]
   requires:
     name: Zca
     version: ">= 1.0.0"