Add vxrm to the combination (for #19)

configs/vaadd.vv.toml

@@ -1,5 +1,6 @@
 name = "vaadd.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vaadd.vx.toml

@@ -1,5 +1,6 @@
 name = "vaadd.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vaaddu.vv.toml

@@ -1,5 +1,6 @@
 name = "vaaddu.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vaaddu.vx.toml

@@ -1,5 +1,6 @@
 name = "vaaddu.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vasub.vv.toml

@@ -1,5 +1,6 @@
 name = "vasub.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vasub.vx.toml

@@ -1,5 +1,6 @@
 name = "vasub.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vasubu.vv.toml

@@ -1,5 +1,6 @@
 name = "vasubu.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vasubu.vx.toml

@@ -1,5 +1,6 @@
 name = "vasubu.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclip.wi.toml

@@ -1,5 +1,6 @@
 name = "vnclip.wi"
 format = "vd,vs2,uimm,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclip.wv.toml

@@ -1,5 +1,6 @@
 name = "vnclip.wv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclip.wx.toml

@@ -1,5 +1,6 @@
 name = "vnclip.wx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclipu.wi.toml

@@ -1,5 +1,6 @@
 name = "vnclipu.wi"
 format = "vd,vs2,uimm,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclipu.wv.toml

@@ -1,5 +1,6 @@
 name = "vnclipu.wv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vnclipu.wx.toml

@@ -1,5 +1,6 @@
 name = "vnclipu.wx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vsmul.vv.toml

@@ -1,5 +1,6 @@
 name = "vsmul.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vsmul.vx.toml

@@ -1,5 +1,6 @@
 name = "vsmul.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssra.vi.toml

@@ -1,5 +1,6 @@
 name = "vssra.vi"
 format = "vd,vs2,uimm,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssra.vv.toml

@@ -1,5 +1,6 @@
 name = "vssra.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssra.vx.toml

@@ -1,5 +1,6 @@
 name = "vssra.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssrl.vi.toml

@@ -1,5 +1,6 @@
 name = "vssrl.vi"
 format = "vd,vs2,uimm,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssrl.vv.toml

@@ -1,5 +1,6 @@
 name = "vssrl.vv"
 format = "vd,vs2,vs1,vm"
+vxrm = true
 
 [tests]
 base = [

configs/vssrl.vx.toml

@@ -1,5 +1,6 @@
 name = "vssrl.vx"
 format = "vd,vs2,rs1,vm"
+vxrm = true
 
 [tests]
 base = [

generator/insn.go

@@ -53,6 +53,7 @@ func (t *TestData) String() string {
 type Insn struct {
 	Name     string     `toml:"name"`
 	Format   insnFormat `toml:"format"`
+	Vxrm     bool       `toml:"vxrm"`
 	Tests    tests      `toml:"tests"`
 	Option   Option     `toml:"-"`
 	TestData *TestData
@@ -437,18 +438,22 @@ type combination struct {
 	LMUL1 LMUL
 	Vl    int
 	Mask  bool
+	VXRM  VXRM
 }
 
-func (c *combination) comment() string {
-	return fmt.Sprintf(
-		"\n\n# Generating tests for VL: %d, LMUL: %s, SEW: %s, Mask: %v\n\n",
-		c.Vl,
-		c.LMUL.String(),
-		c.SEW.String(),
-		c.Mask)
+func (c *combination) initialize() string {
+	// write comments, set vxrm
+	return fmt.Sprintf(`
+# Generating tests for VL: %d, LMUL: %s, SEW: %s, Mask: %v
+
+# Initialize vxrm CSR.
+csrwi vxrm, %d # %s
+
+`,
+		c.Vl, c.LMUL.String(), c.SEW.String(), c.Mask, c.VXRM, c.VXRM)
 }
 
-func (i *Insn) combinations(lmuls []LMUL, sews []SEW, masks []bool) []combination {
+func (i *Insn) combinations(lmuls []LMUL, sews []SEW, masks []bool, vxrms []VXRM) []combination {
 	res := make([]combination, 0)
 	for _, lmul := range lmuls {
 		for _, sew := range sews {
@@ -462,13 +467,16 @@ func (i *Insn) combinations(lmuls []LMUL, sews []SEW, masks []bool) []combinatio
 			for _, mask := range masks {
 				vlmax1 := int((float64(i.Option.VLEN) / float64(sew)) * float64(lmul1))
 				for _, vl := range []int{0, vlmax1 / 2, vlmax1, vlmax1 + 1} {
-					res = append(res, combination{
-						SEW:   sew,
-						LMUL:  lmul,
-						LMUL1: lmul1,
-						Vl:    vl,
-						Mask:  mask,
-					})
+					for _, vxrm := range vxrms {
+						res = append(res, combination{
+							SEW:   sew,
+							LMUL:  lmul,
+							LMUL1: lmul1,
+							Vl:    vl,
+							Mask:  mask,
+							VXRM:  vxrm,
+						})
+					}
 				}
 			}
 		}
@@ -477,6 +485,13 @@ func (i *Insn) combinations(lmuls []LMUL, sews []SEW, masks []bool) []combinatio
 	return res
 }
 
+func (i *Insn) vxrms() []VXRM {
+	if i.Vxrm {
+		return allVXRMs
+	}
+	return noVXRMs
+}
+
 type vsetvlicombinations struct {
 	SEW  SEW
 	LMUL LMUL

generator/insn_fdvs2.go

@@ -6,12 +6,12 @@ import (
 )
 
 func (i *Insn) genCodeFdVs2(pos int) []string {
-	combinations := i.combinations([]LMUL{1}, floatSEWs, []bool{false})
+	combinations := i.combinations([]LMUL{1}, floatSEWs, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		vs2 := int(c.LMUL1) * 2

generator/insn_rdvs2.go

@@ -6,12 +6,12 @@ import (
 )
 
 func (i *Insn) genCodeRdVs2(pos int) []string {
-	combinations := i.combinations([]LMUL{1}, allSEWs, []bool{false})
+	combinations := i.combinations([]LMUL{1}, allSEWs, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		vs2 := int(c.LMUL1) * 2

generator/insn_rdvs2vm.go

@@ -6,12 +6,12 @@ import (
 )
 
 func (i *Insn) genCodeRdVs2Vm(pos int) []string {
-	combinations := i.combinations([]LMUL{1}, []SEW{8}, []bool{false, true})
+	combinations := i.combinations([]LMUL{1}, []SEW{8}, []bool{false, true}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		vs2 := int(c.LMUL1) * 2

generator/insn_util.go

@@ -5,9 +5,23 @@ import (
 	"log"
 	"regexp"
 	"strconv"
-	"strings"
 )
 
+type VXRM int
+
+var allVXRMs = []VXRM{0, 1, 2, 3}
+var noVXRMs = []VXRM{0}
+var vxrmNames = map[VXRM]string{
+	allVXRMs[0]: "rnu (round-to-nearest-up)",
+	allVXRMs[1]: "rne (round-to-nearest-even)",
+	allVXRMs[2]: "rdn (round-down (truncate))",
+	allVXRMs[3]: "rod round-to-odd (OR bits into LSB, aka \"jam\")",
+}
+
+func (v VXRM) String() string {
+	return vxrmNames[v]
+}
+
 type SEW int
 
 var allSEWs = []SEW{8, 16, 32, 64}
@@ -82,10 +96,6 @@ func v0t(mask bool) string {
 	return ""
 }
 
-func trimBoth(name, prefix, suffix string) string {
-	return strings.TrimSuffix(strings.TrimPrefix(name, prefix), suffix)
-}
-
 func getEEW(name string) SEW {
 	s := regexp.MustCompile(`v.+?(\d+)f*\.v`)
 	eew, err := strconv.Atoi(s.FindStringSubmatch(name)[1])

generator/insn_vdfs1.go

@@ -7,12 +7,12 @@ import (
 
 func (i *Insn) genCodeVdFs1(pos int) []string {
 	lmuls := iff(strings.HasSuffix(i.Name, ".s.f"), []LMUL{1}, allLMULs)
-	combinations := i.combinations(lmuls, floatSEWs, []bool{false})
+	combinations := i.combinations(lmuls, floatSEWs, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		builder.WriteString(i.gWriteRandomData(c.LMUL1))

generator/insn_vdfs1vs2vm.go

@@ -15,12 +15,13 @@ func (i *Insn) genCodeVdFs1Vs2Vm(pos int) []string {
 		iff(vdWidening, wideningMULs, allLMULs),
 		sews,
 		[]bool{false, true},
+		i.vxrms(),
 	)
 	res := make([]string, 0, len(combinations))
 
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		builder.WriteString(i.gWriteRandomData(LMUL(1)))
 		builder.WriteString(i.gLoadDataIntoRegisterGroup(0, LMUL(1), SEW(32)))

generator/insn_vdimm.go

@@ -6,12 +6,12 @@ import (
 )
 
 func (i *Insn) genCodeVdImm(pos int) []string {
-	combinations := i.combinations(allLMULs, allSEWs, []bool{false})
+	combinations := i.combinations(allLMULs, allSEWs, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		builder.WriteString(i.gWriteRandomData(c.LMUL1))

generator/insn_vdrs1.go

@@ -7,12 +7,12 @@ import (
 
 func (i *Insn) genCodeVdRs1(pos int) []string {
 	lmuls := iff(strings.HasSuffix(i.Name, ".s.x"), []LMUL{1}, allLMULs)
-	combinations := i.combinations(lmuls, allSEWs, []bool{false})
+	combinations := i.combinations(lmuls, allSEWs, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		builder.WriteString(i.gWriteRandomData(c.LMUL1))

generator/insn_vdrs1m.go

@@ -19,13 +19,13 @@ func (i *Insn) genCodeVdRs1m(pos int) []string {
 		lmuls = []LMUL{LMUL(nfields)}
 		sews = []SEW{SEW(eew)}
 	}
-	combinations := i.combinations(lmuls, sews, []bool{false})
+	combinations := i.combinations(lmuls, sews, []bool{false}, i.vxrms())
 
 	res := make([]string, 0, len(combinations))
 
 	for _, c := range combinations[pos:] {
 		builder := strings.Builder{}
-		builder.WriteString(c.comment())
+		builder.WriteString(c.initialize())
 
 		vd := int(c.LMUL1)
 		builder.WriteString(i.gWriteRandomData(c.LMUL1))