From 7dddfbf688cdf42580f8c756c75204a07702cf77 Mon Sep 17 00:00:00 2001
From: LDj3SNuD <35856442+LDj3SNuD@users.noreply.github.com>
Date: Mon, 8 Jul 2019 16:55:37 +0200
Subject: [PATCH] Add Saddlv_V Inst. Improve Cnt_V, Dup_Gp & Ins_Gp Tests.
 Tuneup Cls_V & Clz_V Tests. (#720)

* Update PackageReferences.

* Improve Cnt_V Test. Tuneup Cls_V & Clz_V Tests.

Nit.

* Nit.

* Improve Dup_Gp & Ins_Gp Tests.

* Update for Saddlv_V Inst.

* Update for Saddlv_V Inst.

* Update for Saddlv_V Inst.
---
 Instructions/InstEmitSimdArithmetic.cs | 21 ++++++---------------
 Instructions/InstEmitSimdHelper.cs     | 22 ++++++++++++++++++----
 OpCodeTable.cs                         |  2 ++
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Instructions/InstEmitSimdArithmetic.cs b/Instructions/InstEmitSimdArithmetic.cs
index 8cf5c2c..fa9666e 100644
--- a/Instructions/InstEmitSimdArithmetic.cs
+++ b/Instructions/InstEmitSimdArithmetic.cs
@@ -2206,6 +2206,11 @@ namespace ChocolArm64.Instructions
             EmitAddLongPairwise(context, signed: true, accumulate: false);
         }
 
+        public static void Saddlv_V(ILEmitterCtx context)
+        {
+            EmitVectorLongAcrossVectorOpSx(context, () => context.Emit(OpCodes.Add));
+        }
+
         public static void Saddw_V(ILEmitterCtx context)
         {
             if (Optimizations.UseSse41)
@@ -3041,21 +3046,7 @@ namespace ChocolArm64.Instructions
 
         public static void Uaddlv_V(ILEmitterCtx context)
         {
-            OpCodeSimd64 op = (OpCodeSimd64)context.CurrOp;
-
-            int bytes = op.GetBitsCount() >> 3;
-            int elems = bytes >> op.Size;
-
-            EmitVectorExtractZx(context, op.Rn, 0, op.Size);
-
-            for (int index = 1; index < elems; index++)
-            {
-                EmitVectorExtractZx(context, op.Rn, index, op.Size);
-
-                context.Emit(OpCodes.Add);
-            }
-
-            EmitScalarSet(context, op.Rd, op.Size + 1);
+            EmitVectorLongAcrossVectorOpZx(context, () => context.Emit(OpCodes.Add));
         }
 
         public static void Uaddw_V(ILEmitterCtx context)
diff --git a/Instructions/InstEmitSimdHelper.cs b/Instructions/InstEmitSimdHelper.cs
index 573b804..c8c8df7 100644
--- a/Instructions/InstEmitSimdHelper.cs
+++ b/Instructions/InstEmitSimdHelper.cs
@@ -823,15 +823,29 @@ namespace ChocolArm64.Instructions
 
         public static void EmitVectorAcrossVectorOpSx(ILEmitterCtx context, Action emit)
         {
-            EmitVectorAcrossVectorOp(context, emit, true);
+            EmitVectorAcrossVectorOp(context, emit, signed: true, isLong: false);
         }
 
         public static void EmitVectorAcrossVectorOpZx(ILEmitterCtx context, Action emit)
         {
-            EmitVectorAcrossVectorOp(context, emit, false);
+            EmitVectorAcrossVectorOp(context, emit, signed: false, isLong: false);
         }
 
-        public static void EmitVectorAcrossVectorOp(ILEmitterCtx context, Action emit, bool signed)
+        public static void EmitVectorLongAcrossVectorOpSx(ILEmitterCtx context, Action emit)
+        {
+            EmitVectorAcrossVectorOp(context, emit, signed: true, isLong: true);
+        }
+
+        public static void EmitVectorLongAcrossVectorOpZx(ILEmitterCtx context, Action emit)
+        {
+            EmitVectorAcrossVectorOp(context, emit, signed: false, isLong: true);
+        }
+
+        public static void EmitVectorAcrossVectorOp(
+            ILEmitterCtx context,
+            Action emit,
+            bool signed,
+            bool isLong)
         {
             OpCodeSimd64 op = (OpCodeSimd64)context.CurrOp;
 
@@ -847,7 +861,7 @@ namespace ChocolArm64.Instructions
                 emit();
             }
 
-            EmitScalarSet(context, op.Rd, op.Size);
+            EmitScalarSet(context, op.Rd, isLong ? op.Size + 1 : op.Size);
         }
 
         public static void EmitVectorPairwiseOpF(ILEmitterCtx context, Action emit)
diff --git a/OpCodeTable.cs b/OpCodeTable.cs
index 819881e..94272d5 100644
--- a/OpCodeTable.cs
+++ b/OpCodeTable.cs
@@ -439,6 +439,8 @@ namespace ChocolArm64
             SetA64("0x001110<<100000011010xxxxxxxxxx", InstEmit.Sadalp_V,        typeof(OpCodeSimd64));
             SetA64("0x001110<<1xxxxx000000xxxxxxxxxx", InstEmit.Saddl_V,         typeof(OpCodeSimdReg64));
             SetA64("0x001110<<100000001010xxxxxxxxxx", InstEmit.Saddlp_V,        typeof(OpCodeSimd64));
+            SetA64("000011100x110000001110xxxxxxxxxx", InstEmit.Saddlv_V,        typeof(OpCodeSimd64));
+            SetA64("01001110<<110000001110xxxxxxxxxx", InstEmit.Saddlv_V,        typeof(OpCodeSimd64));
             SetA64("0x001110<<1xxxxx000100xxxxxxxxxx", InstEmit.Saddw_V,         typeof(OpCodeSimdReg64));
             SetA64("x00111100x100010000000xxxxxxxxxx", InstEmit.Scvtf_Gp,        typeof(OpCodeSimdCvt64));
             SetA64(">00111100x000010>xxxxxxxxxxxxxxx", InstEmit.Scvtf_Gp_Fixed,  typeof(OpCodeSimdCvt64));