Add Zbkb to bitmanip tests and regenerate vectors

test/sim/bitmanip-random/.gitignore

@@ -1,2 +1,3 @@
 test
 refgen
+tmp

test/sim/bitmanip-random/Makefile

@@ -1,7 +1,8 @@
-BIN_ARCH     = rv32imc_zba_zbb_zbc_zbs_zicsr
+BIN_ARCH     = rv32imac_zba_zbb_zbc_zbs_zbkb_zicsr
 SIM_EXEC     = ../tb_cxxrtl/tb
 
-CROSS_PREFIX = /opt/riscv/bin/riscv32-unknown-elf-
+RISCV        = /opt/riscv
+CROSS_PREFIX = $(RISCV)/bin/riscv32-unknown-elf-
 SPIKE        = spike
 PK           = $(RISCV)/riscv32-unknown-elf/bin/pk
 

test/sim/bitmanip-random/reference/bexti.reference_output

@@ -2110,119 +2110,128 @@
 00000001
 00000001
 00000000
+00000000
 00000001
+00000000
 00000001
 00000001
 00000000
 00000001
 00000001
-00000000
+00000001
-00000000
-00000000
-00000000
 00000000
 00000000
 00000001
 00000000
 00000000
 00000001
+00000001
 00000000
 00000000
 00000000
 00000001
-00000000
-00000000
 00000001
 00000000
-00000000
+00000001
-00000000
+00000001
 00000001
 00000000
 00000001
+00000001
 00000000
+00000001
 00000000
+00000001
+00000001
 00000000
+00000001
+00000001
 00000000
 00000000
 00000001
+00000001
 00000000
 00000001
 00000001
 00000000
 00000000
+00000001
 00000000
 00000000
 00000000
 00000001
-00000000
+00000001
+00000001
 00000000
 00000000
 00000001
-00000000
 00000001
+00000001
+00000000
 00000000
 00000001
 00000001
-00000000
+00000001
 00000001
 00000001
 00000000
 00000000
 00000000
-00000000
-00000001
 00000001
 00000000
-00000000
 00000001
 00000000
 00000000
-00000000
+00000001
+00000001
 00000001
 00000000
+00000001
 00000000
 00000001
 00000000
 00000001
+00000001
+00000001
+00000001
 00000000
 00000001
+00000001
 00000000
 00000000
-00000001
 00000000
 00000001
 00000000
 00000000
+00000001
 00000000
 00000000
 00000001
 00000000
 00000001
 00000001
-00000001
-00000001
 00000000
 00000000
-00000001
+00000000
+00000000
 00000000
 00000001
 00000001
 00000001
 00000000
 00000001
-00000000
 00000001
 00000001
+00000000
 00000001
 00000001
 00000000
 00000000
 00000000
+00000001
 00000000
 00000000
-00000000
+00000001
-00000000
-00000000
 00000000
 00000000
 00000000
@@ -2230,15 +2239,13 @@
 00000001
 00000001
 00000000
-00000000
+00000001
-00000000
-00000000
 00000001
 00000001
 00000000
 00000001
 00000001
-00000000
+00000001
 00000001
 00000001
 00000000
@@ -2248,31 +2255,31 @@
 00000000
 00000000
 00000000
-00000000
-00000000
-00000000
 00000001
-00000000
 00000001
 00000000
+00000001
+00000001
+00000001
 00000000
 00000000
 00000000
-00000001
 00000000
 00000000
+00000001
+00000001
 00000000
+00000001
 00000000
 00000001
 00000000
 00000000
+00000000
 00000001
 00000001
 00000001
-00000000
 00000001
 00000000
-00000000
 00000001
 00000001
 00000001
@@ -2281,21 +2288,17 @@
 00000001
 00000000
 00000000
-00000001
+00000000
 00000000
 00000001
 00000001
 00000001
+00000001
 00000000
 00000001
 00000001
-00000000
-00000000
-00000000
-00000000
 00000001
 00000001
-00000000
 00000001
 00000001
 00000001
@@ -2303,65 +2306,61 @@
 00000000
 00000000
 00000001
-00000000
 00000001
 00000000
-00000001
 00000000
+00000001
 00000000
 00000000
 00000001
 00000000
-00000001
 00000000
 00000001
 00000000
 00000001
-00000001
 00000000
 00000001
 00000000
-00000001
+00000000
+00000000
+00000000
+00000000
 00000000
 00000001
 00000001
-00000001
+00000000
-00000001
 00000001
 00000001
 00000000
+00000001
 00000000
 00000001
 00000001
 00000000
+00000000
 00000001
 00000000
 00000000
 00000001
 00000000
 00000000
+00000001
+00000001
 00000000
 00000000
 00000000
-00000001
 00000000
 00000001
 00000000
 00000000
 00000001
 00000001
-00000001
-00000001
-00000001
-00000001
 00000000
 00000000
 00000000
 00000000
 00000000
 00000001
-00000000
-00000000
 00000001
 00000001
 00000000
@@ -2376,17 +2375,15 @@
 00000000
 00000001
 00000001
-00000001
-00000001
-00000001
 00000000
 00000001
-00000000
 00000001
 00000000
 00000000
 00000001
 00000001
+00000000
+00000001
 00000001
 00000000
 00000000
@@ -2394,87 +2391,89 @@
 00000001
 00000001
 00000001
-00000000
+00000001
-00000000
-00000000
 00000000
 00000001
 00000001
 00000000
-00000001
 00000000
 00000001
 00000001
+00000001
 00000000
 00000001
 00000001
 00000001
 00000000
 00000000
+00000001
+00000000
 00000000
 00000000
 00000000
 00000000
 00000000
 00000001
+00000000
 00000001
 00000001
+00000000
 00000001
 00000001
 00000000
-00000000
-00000000
-00000000
 00000001
 00000001
 00000000
 00000001
 00000001
+00000000
 00000001
 00000000
+00000001
 00000000
 00000000
+00000001
 00000000
+00000001
+00000001
+00000001
+00000001
+00000001
+00000001
+00000001
 00000000
+00000001
 00000000
 00000000
-00000001
 00000000
 00000001
 00000001
 00000000
 00000000
-00000000
 00000001
 00000000
 00000001
-00000000
+00000001
 00000000
 00000000
 00000000
 00000000
 00000001
-00000001
-00000001
 00000000
 00000001
-00000001
-00000000
-00000000
 00000000
 00000001
 00000001
 00000001
 00000001
 00000001
-00000000
-00000000
 00000001
 00000001
 00000000
 00000000
 00000001
 00000000
+00000001
 00000000
 00000001
 00000001
@@ -2484,17 +2483,17 @@
 00000001
 00000000
 00000001
-00000000
 00000001
-00000000
 00000001
 00000001
 00000001
 00000000
+00000001
+00000000
 00000000
 00000000
 00000001
-00000001
+00000000
 00000001
 00000000
 00000001
@@ -2503,6 +2502,10 @@
 00000001
 00000001
 00000001
+00000000
+00000000
+00000000
+00000001
 00000001
 00000000
 00000000
@@ -2511,13 +2514,19 @@
 00000000
 00000000
 00000000
+00000000
+00000000
+00000000
+00000000
 00000001
 00000001
+00000000
 00000001
+00000000
+00000000
 00000001
 00000001
 00000000
-00000000
 00000001
 00000001
 00000000
@@ -2526,36 +2535,46 @@
 00000000
 00000001
 00000000
-00000001
+00000000
 00000001
 00000000
 00000000
 00000001
+00000001
 00000000
 00000001
 00000000
+00000000
 00000001
+00000000
 00000001
+00000000
 00000001
 00000001
 00000000
 00000000
 00000000
-00000000
 00000001
 00000001
+00000000
+00000001
 00000001
 00000001
 00000001
 00000000
 00000000
+00000000
 00000001
 00000001
+00000000
 00000001
+00000000
 00000001
 00000001
 00000000
 00000000
+00000000
+00000001
 00000001
 00000000
 00000001
@@ -2564,9 +2583,13 @@
 00000000
 00000000
 00000000
+00000000
 00000001
 00000000
 00000000
+00000000
+00000001
+00000001
 00000001
 00000000
 00000001
@@ -2581,46 +2604,48 @@
 00000000
 00000000
 00000000
-00000001
-00000001
-00000000
 00000000
 00000001
+00000000
 00000001
 00000000
 00000000
 00000001
+00000000
 00000001
 00000001
 00000000
-00000000
 00000001
 00000000
 00000001
+00000001
 00000000
 00000001
 00000001
 00000000
 00000001
-00000000
+00000001
 00000001
 00000000
+00000001
 00000000
+00000001
+00000001
 00000000
 00000000
 00000001
-00000000
+00000001
 00000000
 00000000
 00000000
 00000001
+00000000
 00000001
 00000000
 00000000
 00000001
 00000000
 00000000
-00000001
 00000000
 00000000
 00000001
@@ -2628,29 +2653,19 @@
 00000001
 00000001
 00000000
-00000001
-00000001
 00000000
 00000000
-00000001
 00000000
 00000001
-00000000
 00000001
 00000001
-00000000
-00000000
-00000000
 00000001
 00000001
+00000000
 00000001
 00000000
 00000000
 00000000
-00000001
-00000000
-00000001
-00000001
 00000000
 00000001
 00000000
@@ -2661,41 +2676,30 @@
 00000001
 00000001
 00000001
-00000000
-00000000
 00000001
 00000000
-00000000
-00000001
 00000001
 00000000
 00000000
+00000000
 00000001
 00000001
 00000001
 00000001
-00000000
-00000000
-00000001
-00000000
 00000001
 00000000
 00000001
 00000000
-00000001
-00000001
 00000000
 00000000
 00000000
 00000000
 00000000
 00000001
-00000000
 00000001
 00000000
 00000000
-00000001
+00000000
-00000001
 00000001
 00000000
 00000000
@@ -2703,50 +2707,46 @@
 00000001
 00000000
 00000001
+00000001
 00000000
 00000001
 00000001
 00000001
-00000000
-00000000
 00000001
 00000001
 00000001
 00000000
-00000001
 00000000
 00000001
-00000001
+00000000
-00000001
 00000001
 00000001
 00000001
 00000000
+00000000
+00000000
+00000000
+00000000
+00000000
 00000001
 00000001
 00000000
 00000001
 00000001
+00000000
 00000001
 00000001
 00000001
 00000000
 00000000
 00000001
-00000001
 00000000
-00000001
-00000001
 00000000
-00000001
 00000000
-00000001
 00000000
 00000000
-00000001
 00000000
-00000001
 00000000
 00000000
 00000001
-00000001
+00000000

test/sim/bitmanip-random/reference/brev8.reference_output

@@ -0,0 +1,86 @@
+00000000
+00000080
+00000040
+00000020
+00000010
+00000008
+00000004
+00000002
+00000001
+00008000
+00004000
+00002000
+00001000
+00000800
+00000400
+00000200
+00000100
+00800000
+00400000
+00200000
+00100000
+00080000
+00040000
+00020000
+00010000
+80000000
+40000000
+20000000
+10000000
+08000000
+04000000
+02000000
+01000000
+ffffffff
+ffffff7f
+ffffffbf
+ffffffdf
+ffffffef
+fffffff7
+fffffffb
+fffffffd
+fffffffe
+ffff7fff
+ffffbfff
+ffffdfff
+ffffefff
+fffff7ff
+fffffbff
+fffffdff
+fffffeff
+ff7fffff
+ffbfffff
+ffdfffff
+ffefffff
+fff7ffff
+fffbffff
+fffdffff
+fffeffff
+7fffffff
+bfffffff
+dfffffff
+efffffff
+f7ffffff
+fbffffff
+fdffffff
+feffffff
+026c19c5
+8d591d85
+a7c2301a
+eee82d8b
+cdf640e2
+d7af0ce2
+00da451f
+1162c45f
+42bacc99
+599a48bf
+0a4d7fd0
+b70d0a9d
+e209b7a9
+71c69ca3
+26db284d
+f5df1a33
+327936a5
+6c68dcd7
+44f9458c
+cb427c85

test/sim/bitmanip-random/reference/unzip.reference_output

@@ -0,0 +1,86 @@
+00000000
+00000001
+00010000
+00000002
+00020000
+00000004
+00040000
+00000008
+00080000
+00000010
+00100000
+00000020
+00200000
+00000040
+00400000
+00000080
+00800000
+00000100
+01000000
+00000200
+02000000
+00000400
+04000000
+00000800
+08000000
+00001000
+10000000
+00002000
+20000000
+00004000
+40000000
+00008000
+80000000
+ffffffff
+fffffffe
+fffeffff
+fffffffd
+fffdffff
+fffffffb
+fffbffff
+fffffff7
+fff7ffff
+ffffffef
+ffefffff
+ffffffdf
+ffdfffff
+ffffffbf
+ffbfffff
+ffffff7f
+ff7fffff
+fffffeff
+feffffff
+fffffdff
+fdffffff
+fffffbff
+fbffffff
+fffff7ff
+f7ffffff
+ffffefff
+efffffff
+ffffdfff
+dfffffff
+ffffbfff
+bfffffff
+ffff7fff
+7fffffff
+a0c112ff
+f18a864e
+36152bc9
+7dcfaa79
+4bcc3ea6
+3d04e250
+f3052d5b
+75b8a4b8
+73db7dd5
+5c99416d
+1aa16c4c
+f0c7ecb9
+e38b0174
+8e06ecb6
+7637920f
+30736aa8
+08effe18
+9e2e89e5
+8049f426
+bb84eadf

test/sim/bitmanip-random/reference/zip.reference_output

@@ -0,0 +1,86 @@
+00000000
+00000001
+00000004
+00000010
+00000040
+00000100
+00000400
+00001000
+00004000
+00010000
+00040000
+00100000
+00400000
+01000000
+04000000
+10000000
+40000000
+00000002
+00000008
+00000020
+00000080
+00000200
+00000800
+00002000
+00008000
+00020000
+00080000
+00200000
+00800000
+02000000
+08000000
+20000000
+80000000
+ffffffff
+fffffffe
+fffffffb
+ffffffef
+ffffffbf
+fffffeff
+fffffbff
+ffffefff
+ffffbfff
+fffeffff
+fffbffff
+ffefffff
+ffbfffff
+feffffff
+fbffffff
+efffffff
+bfffffff
+fffffffd
+fffffff7
+ffffffdf
+ffffff7f
+fffffdff
+fffff7ff
+ffffdfff
+ffff7fff
+fffdffff
+fff7ffff
+ffdfffff
+ff7fffff
+fdffffff
+f7ffffff
+dfffffff
+7fffffff
+73588e54
+d8fe6d93
+ff0ed2ab
+717bb17c
+6cb04bce
+5fd04b42
+60aa113f
+10fb2386
+88520b91
+ce61f391
+fda98d99
+515140ac
+d05f97c5
+ceadad61
+ae100192
+1d9334b5
+481c9361
+b9f62e91
+4603405b
+c8c23761

test/sim/bitmanip-random/vector-gen

@@ -27,6 +27,9 @@ instr_one_operand = [
 	("sext.b" , [*all_onehot0_neg, *get_random()]),
 	("sext.h" , [*all_onehot0_neg, *get_random()]),
 	("zext.h" , [*all_onehot0_neg, *get_random()]),
+	("zip"    , [*all_onehot0_neg, *get_random()]),
+	("unzip"  , [*all_onehot0_neg, *get_random()]),
+	("brev8"   , [*all_onehot0_neg, *get_random()]),
 ]
 
 instr_reg_reg = [
@@ -49,6 +52,8 @@ instr_reg_reg = [
 	("bext"   , [*all_onehot0_neg, *get_random()], [*all_onehot0_neg, *all_shamt, *get_random()]),
 	("binv"   , [*all_onehot0_neg, *get_random()], [*all_onehot0_neg, *all_shamt, *get_random()]),
 	("bset"   , [*all_onehot0_neg, *get_random()], [*all_onehot0_neg, *all_shamt, *get_random()]),
+	("pack"   , [*all_onehot0_neg, *get_random()], [*all_onehot0_neg,             *get_random()]),
+	("packh"  , [*all_onehot0_neg, *get_random()], [*all_onehot0_neg,             *get_random()]),
 ]
 
 instr_reg_imm = [