rvv: change to 0.9amo

Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com>

45 files changed, 72 insertions, 18 deletions

diff --git a/riscv/insns/vamoadde16_v.h b/riscv/insns/vamoadde16_v.h
new file mode 100644
index 0000000..06b8c79
--- /dev/null
+++ b/riscv/insns/vamoadde16_v.h
@@ -0,0 +1,2 @@
+//vamoadde.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs + vs3; }, uint, e8);
diff --git a/riscv/insns/vamoadde32_v.h b/riscv/insns/vamoadde32_v.h
new file mode 100644
index 0000000..06b8c79
--- /dev/null
+++ b/riscv/insns/vamoadde32_v.h
@@ -0,0 +1,2 @@
+//vamoadde.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs + vs3; }, uint, e8);
diff --git a/riscv/insns/vamoadde64_v.h b/riscv/insns/vamoadde64_v.h
new file mode 100644
index 0000000..06b8c79
--- /dev/null
+++ b/riscv/insns/vamoadde64_v.h
@@ -0,0 +1,2 @@
+//vamoadde.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs + vs3; }, uint, e8);
diff --git a/riscv/insns/vamoadde8_v.h b/riscv/insns/vamoadde8_v.h
new file mode 100644
index 0000000..06b8c79
--- /dev/null
+++ b/riscv/insns/vamoadde8_v.h
@@ -0,0 +1,2 @@
+//vamoadde.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs + vs3; }, uint, e8);
diff --git a/riscv/insns/vamoadde_v.h b/riscv/insns/vamoadde_v.h
deleted file mode 100644
index 9e59bdd..0000000
--- a/riscv/insns/vamoadde_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamoadde.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs + vs3; }, uint);
diff --git a/riscv/insns/vamoande16_v.h b/riscv/insns/vamoande16_v.h
new file mode 100644
index 0000000..c47645d
--- /dev/null
+++ b/riscv/insns/vamoande16_v.h
@@ -0,0 +1,2 @@
+//vamoande.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs & vs3; }, uint, e8);
diff --git a/riscv/insns/vamoande32_v.h b/riscv/insns/vamoande32_v.h
new file mode 100644
index 0000000..c47645d
--- /dev/null
+++ b/riscv/insns/vamoande32_v.h
@@ -0,0 +1,2 @@
+//vamoande.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs & vs3; }, uint, e8);
diff --git a/riscv/insns/vamoande64_v.h b/riscv/insns/vamoande64_v.h
new file mode 100644
index 0000000..c47645d
--- /dev/null
+++ b/riscv/insns/vamoande64_v.h
@@ -0,0 +1,2 @@
+//vamoande.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs & vs3; }, uint, e8);
diff --git a/riscv/insns/vamoande8_v.h b/riscv/insns/vamoande8_v.h
new file mode 100644
index 0000000..c47645d
--- /dev/null
+++ b/riscv/insns/vamoande8_v.h
@@ -0,0 +1,2 @@
+//vamoande.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs & vs3; }, uint, e8);
diff --git a/riscv/insns/vamoande_v.h b/riscv/insns/vamoande_v.h
deleted file mode 100644
index 90eb60d..0000000
--- a/riscv/insns/vamoande_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamoande.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs & vs3; }, uint);
diff --git a/riscv/insns/vamomaxe16_v.h b/riscv/insns/vamomaxe16_v.h
new file mode 100644
index 0000000..9697b3a
--- /dev/null
+++ b/riscv/insns/vamomaxe16_v.h
@@ -0,0 +1,2 @@
+//vamomaxe.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomaxe32_v.h b/riscv/insns/vamomaxe32_v.h
new file mode 100644
index 0000000..9697b3a
--- /dev/null
+++ b/riscv/insns/vamomaxe32_v.h
@@ -0,0 +1,2 @@
+//vamomaxe.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomaxe64_v.h b/riscv/insns/vamomaxe64_v.h
new file mode 100644
index 0000000..9697b3a
--- /dev/null
+++ b/riscv/insns/vamomaxe64_v.h
@@ -0,0 +1,2 @@
+//vamomaxe.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomaxe8_v.h b/riscv/insns/vamomaxe8_v.h
new file mode 100644
index 0000000..9697b3a
--- /dev/null
+++ b/riscv/insns/vamomaxe8_v.h
@@ -0,0 +1,2 @@
+//vamomaxe.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomaxe_v.h b/riscv/insns/vamomaxe_v.h
deleted file mode 100644
index ab6539d..0000000
--- a/riscv/insns/vamomaxe_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamomaxe.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs >= vs3 ? lhs : vs3; }, int);
diff --git a/riscv/insns/vamomaxue16_v.h b/riscv/insns/vamomaxue16_v.h
new file mode 100644
index 0000000..357ba24
--- /dev/null
+++ b/riscv/insns/vamomaxue16_v.h
@@ -0,0 +1,2 @@
+//vamomaxue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamomaxue32_v.h b/riscv/insns/vamomaxue32_v.h
new file mode 100644
index 0000000..357ba24
--- /dev/null
+++ b/riscv/insns/vamomaxue32_v.h
@@ -0,0 +1,2 @@
+//vamomaxue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamomaxue64_v.h b/riscv/insns/vamomaxue64_v.h
new file mode 100644
index 0000000..357ba24
--- /dev/null
+++ b/riscv/insns/vamomaxue64_v.h
@@ -0,0 +1,2 @@
+//vamomaxue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamomaxue8_v.h b/riscv/insns/vamomaxue8_v.h
new file mode 100644
index 0000000..357ba24
--- /dev/null
+++ b/riscv/insns/vamomaxue8_v.h
@@ -0,0 +1,2 @@
+//vamomaxue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs >= vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamomaxue_v.h b/riscv/insns/vamomaxue_v.h
deleted file mode 100644
index 1bdc50c..0000000
--- a/riscv/insns/vamomaxue_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamomaxue.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs >= vs3 ? lhs : vs3;; }, uint);
diff --git a/riscv/insns/vamomine16_v.h b/riscv/insns/vamomine16_v.h
new file mode 100644
index 0000000..5c035ea
--- /dev/null
+++ b/riscv/insns/vamomine16_v.h
@@ -0,0 +1,2 @@
+//vamomine.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomine32_v.h b/riscv/insns/vamomine32_v.h
new file mode 100644
index 0000000..5c035ea
--- /dev/null
+++ b/riscv/insns/vamomine32_v.h
@@ -0,0 +1,2 @@
+//vamomine.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomine64_v.h b/riscv/insns/vamomine64_v.h
new file mode 100644
index 0000000..5c035ea
--- /dev/null
+++ b/riscv/insns/vamomine64_v.h
@@ -0,0 +1,2 @@
+//vamomine.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomine8_v.h b/riscv/insns/vamomine8_v.h
new file mode 100644
index 0000000..5c035ea
--- /dev/null
+++ b/riscv/insns/vamomine8_v.h
@@ -0,0 +1,2 @@
+//vamomine.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3; }, int, e8);
diff --git a/riscv/insns/vamomine_v.h b/riscv/insns/vamomine_v.h
deleted file mode 100644
index fd931b2..0000000
--- a/riscv/insns/vamomine_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamomine.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs < vs3 ? lhs : vs3; }, int);
diff --git a/riscv/insns/vamominue16_v.h b/riscv/insns/vamominue16_v.h
new file mode 100644
index 0000000..3749d05
--- /dev/null
+++ b/riscv/insns/vamominue16_v.h
@@ -0,0 +1,2 @@
+//vamominue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamominue32_v.h b/riscv/insns/vamominue32_v.h
new file mode 100644
index 0000000..3749d05
--- /dev/null
+++ b/riscv/insns/vamominue32_v.h
@@ -0,0 +1,2 @@
+//vamominue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamominue64_v.h b/riscv/insns/vamominue64_v.h
new file mode 100644
index 0000000..3749d05
--- /dev/null
+++ b/riscv/insns/vamominue64_v.h
@@ -0,0 +1,2 @@
+//vamominue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamominue8_v.h b/riscv/insns/vamominue8_v.h
new file mode 100644
index 0000000..3749d05
--- /dev/null
+++ b/riscv/insns/vamominue8_v.h
@@ -0,0 +1,2 @@
+//vamominue.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs < vs3 ? lhs : vs3;; }, uint, e8);
diff --git a/riscv/insns/vamominue_v.h b/riscv/insns/vamominue_v.h
deleted file mode 100644
index d8616da..0000000
--- a/riscv/insns/vamominue_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamominue.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs < vs3 ? lhs : vs3;; }, uint);
diff --git a/riscv/insns/vamoore16_v.h b/riscv/insns/vamoore16_v.h
new file mode 100644
index 0000000..364035d
--- /dev/null
+++ b/riscv/insns/vamoore16_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs | vs3; }, uint, e8);
diff --git a/riscv/insns/vamoore32_v.h b/riscv/insns/vamoore32_v.h
new file mode 100644
index 0000000..364035d
--- /dev/null
+++ b/riscv/insns/vamoore32_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs | vs3; }, uint, e8);
diff --git a/riscv/insns/vamoore64_v.h b/riscv/insns/vamoore64_v.h
new file mode 100644
index 0000000..364035d
--- /dev/null
+++ b/riscv/insns/vamoore64_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs | vs3; }, uint, e8);
diff --git a/riscv/insns/vamoore8_v.h b/riscv/insns/vamoore8_v.h
new file mode 100644
index 0000000..364035d
--- /dev/null
+++ b/riscv/insns/vamoore8_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs | vs3; }, uint, e8);
diff --git a/riscv/insns/vamoore_v.h b/riscv/insns/vamoore_v.h
deleted file mode 100644
index c35789c..0000000
--- a/riscv/insns/vamoore_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamoore.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs | vs3; }, uint);
diff --git a/riscv/insns/vamoswape16_v.h b/riscv/insns/vamoswape16_v.h
new file mode 100644
index 0000000..af37c8c
--- /dev/null
+++ b/riscv/insns/vamoswape16_v.h
@@ -0,0 +1,2 @@
+//vamoswape.v vd, (rs1), vs2, vd
+VI_AMO({ return vs3; }, uint, e8);
diff --git a/riscv/insns/vamoswape32_v.h b/riscv/insns/vamoswape32_v.h
new file mode 100644
index 0000000..af37c8c
--- /dev/null
+++ b/riscv/insns/vamoswape32_v.h
@@ -0,0 +1,2 @@
+//vamoswape.v vd, (rs1), vs2, vd
+VI_AMO({ return vs3; }, uint, e8);
diff --git a/riscv/insns/vamoswape64_v.h b/riscv/insns/vamoswape64_v.h
new file mode 100644
index 0000000..af37c8c
--- /dev/null
+++ b/riscv/insns/vamoswape64_v.h
@@ -0,0 +1,2 @@
+//vamoswape.v vd, (rs1), vs2, vd
+VI_AMO({ return vs3; }, uint, e8);
diff --git a/riscv/insns/vamoswape8_v.h b/riscv/insns/vamoswape8_v.h
new file mode 100644
index 0000000..af37c8c
--- /dev/null
+++ b/riscv/insns/vamoswape8_v.h
@@ -0,0 +1,2 @@
+//vamoswape.v vd, (rs1), vs2, vd
+VI_AMO({ return vs3; }, uint, e8);
diff --git a/riscv/insns/vamoswape_v.h b/riscv/insns/vamoswape_v.h
deleted file mode 100644
index 4cc15cb..0000000
--- a/riscv/insns/vamoswape_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamoswape.v vd, (rs1), vs2, vd
-VI_AMO({ return vs3; }, uint);
diff --git a/riscv/insns/vamoxore16_v.h b/riscv/insns/vamoxore16_v.h
new file mode 100644
index 0000000..4b6c798
--- /dev/null
+++ b/riscv/insns/vamoxore16_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs ^ vs3; }, uint, e8);
diff --git a/riscv/insns/vamoxore32_v.h b/riscv/insns/vamoxore32_v.h
new file mode 100644
index 0000000..4b6c798
--- /dev/null
+++ b/riscv/insns/vamoxore32_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs ^ vs3; }, uint, e8);
diff --git a/riscv/insns/vamoxore64_v.h b/riscv/insns/vamoxore64_v.h
new file mode 100644
index 0000000..4b6c798
--- /dev/null
+++ b/riscv/insns/vamoxore64_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs ^ vs3; }, uint, e8);
diff --git a/riscv/insns/vamoxore8_v.h b/riscv/insns/vamoxore8_v.h
new file mode 100644
index 0000000..4b6c798
--- /dev/null
+++ b/riscv/insns/vamoxore8_v.h
@@ -0,0 +1,2 @@
+//vamoore.v vd, (rs1), vs2, vd
+VI_AMO({ return lhs ^ vs3; }, uint, e8);
diff --git a/riscv/insns/vamoxore_v.h b/riscv/insns/vamoxore_v.h
deleted file mode 100644
index 7eb1199..0000000
--- a/riscv/insns/vamoxore_v.h
+++ /dev/null
@@ -1,2 +0,0 @@
-//vamoore.v vd, (rs1), vs2, vd
-VI_AMO({ return lhs ^ vs3; }, uint);