From 57dedc8be768b92fc2431e6303a1dfcec0b939ec Mon Sep 17 00:00:00 2001
From: SyedHassanUlHaq <21b-029-cs@students.uit.edu>
Date: Tue, 23 Jul 2024 02:03:55 +0500
Subject: [PATCH] [GSOC] modified generator to generate valid vd, vs2 for
 vwsll.vi

[GSOC] generator modified to be more general
---
 Makefrag                      |  1 -
 configs/vwsll.vi.toml         |  7 +------
 generator/insn_vdvs2uimmvm.go | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefrag b/Makefrag
index 7df055e..8245abf 100644
--- a/Makefrag
+++ b/Makefrag
@@ -1830,7 +1830,6 @@ tests = \
   vwsll.vi-1 \
   vwsll.vi-2 \
   vwsll.vi-3 \
-  vwsll.vi-4 \
   vwsll.vv-0 \
   vwsll.vv-1 \
   vwsll.vx-0 \
diff --git a/configs/vwsll.vi.toml b/configs/vwsll.vi.toml
index ad75086..5a7e2da 100644
--- a/configs/vwsll.vi.toml
+++ b/configs/vwsll.vi.toml
@@ -25,9 +25,4 @@ sew32 = [
     [0x1,  0x7fffffff],
     [0x1f, 0xffffffff]
 ]
-sew64 = [
-    ["0x1f", "0x0000000000000000"],
-    ["0x1",  "0xffffffffffffffff"],
-    ["0x1",  "0x7fffffffffffffff"],
-    ["0x1f", "0xffffffffffffffff"]
-]
+
diff --git a/generator/insn_vdvs2uimmvm.go b/generator/insn_vdvs2uimmvm.go
index e8b41fd..aef931e 100644
--- a/generator/insn_vdvs2uimmvm.go
+++ b/generator/insn_vdvs2uimmvm.go
@@ -7,12 +7,14 @@ import (
 )
 
 func (i *Insn) genCodeVdVs2UimmVm(pos int) []string {
+	vdWidening := strings.HasPrefix(i.Name, "vw")
 	vs2Widening := strings.HasSuffix(i.Name, ".wi")
 	sews := iff(vs2Widening, allSEWs[:len(allSEWs)-2], allSEWs[:len(allSEWs)-1])
 	vs2Size := iff(vs2Widening, 2, 1)
+	vdSize := iff(vdWidening, 2, 1)
 
 	combinations := i.combinations(
-		iff(vs2Widening, wideningMULs, allLMULs),
+		iff(vdWidening || vs2Widening, wideningMULs, allLMULs),
 		sews,
 		[]bool{false, true},
 		i.vxrms(),
@@ -26,11 +28,18 @@ func (i *Insn) genCodeVdVs2UimmVm(pos int) []string {
 		builder.WriteString(i.gWriteRandomData(LMUL(1)))
 		builder.WriteString(i.gLoadDataIntoRegisterGroup(0, LMUL(1), SEW(32)))
 
+		vdEMUL1 := LMUL(math.Max(float64(int(c.LMUL)*vdSize), 1))
 		vs2EMUL1 := LMUL(math.Max(float64(int(c.LMUL)*vs2Size), 1))
+		vdEEW := c.SEW * SEW(vdSize)
 		vs2EEW := c.SEW * SEW(vs2Size)
+		if vdEEW > SEW(i.Option.XLEN) || vs2EEW > SEW(i.Option.XLEN) {
+			res = append(res, "")
+			continue
+		}
+
+		vd := int(vdEMUL1)
+		vs2 := vd * 2
 
-		vd := int(c.LMUL1)
-		vs2 := 2*int(c.LMUL1) + int(vs2EMUL1)
 		builder.WriteString(i.gWriteRandomData(c.LMUL1))
 		builder.WriteString(i.gLoadDataIntoRegisterGroup(vd, c.LMUL1, SEW(8)))