arm: Fix clang compilation for ARMv7

clang is not recognizing some pre-UAL VFP mnemonics like fnmacs, fnmacd,
fnmuls and fnmuld. Replaced them with equivalent UAL mnemonics which are
vmls.f32, vmls.f64, vnmul.f32 and vnmul.f64 respectively.

diff --git a/kernel/arm/axpy_vfp.S b/kernel/arm/axpy_vfp.S
index 8e5334f..4040c7d 100644 (file)
--- a/kernel/arm/axpy_vfp.S
+++ b/kernel/arm/axpy_vfp.S
@@ -71,14 +71,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if defined(DOUBLE)
 
 #define        FMAC_R1 fmacd
-#define FMAC_R2 fnmacd
+#define FMAC_R2 vmls.f64
 #define        FMAC_I1 fmacd
 #define FMAC_I2 fmacd
 
 #else
 
 #define        FMAC_R1 fmacs
-#define FMAC_R2 fnmacs
+#define FMAC_R2 vmls.f32
 #define        FMAC_I1 fmacs
 #define FMAC_I2 fmacs
 
@@ -90,14 +90,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define        FMAC_R1 fmacd
 #define FMAC_R2 fmacd
-#define        FMAC_I1 fnmacd
+#define        FMAC_I1 vmls.f64
 #define FMAC_I2 fmacd
 
 #else
 
 #define        FMAC_R1 fmacs
 #define FMAC_R2 fmacs
-#define        FMAC_I1 fnmacs
+#define        FMAC_I1 vmls.f32
 #define FMAC_I2 fmacs
 
 #endif

diff --git a/kernel/arm/cgemm_kernel_2x2_vfp.S b/kernel/arm/cgemm_kernel_2x2_vfp.S
index f0517cb..639b713 100644 (file)
--- a/kernel/arm/cgemm_kernel_2x2_vfp.S
+++ b/kernel/arm/cgemm_kernel_2x2_vfp.S
@@ -94,42 +94,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(NN) || defined(NT) || defined(TN) || defined(TT)
 
-       #define KMAC_R  fnmacs
+       #define KMAC_R  vmls.f32
        #define KMAC_I  fmacs
 
        #define FMAC_R1 fmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
        #define FMAC_I2 fmacs
 
 #elif defined(CN) || defined(CT)
 
        #define KMAC_R  fmacs
-       #define KMAC_I  fnmacs
+       #define KMAC_I  vmls.f32
 
        #define FMAC_R1 fmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
        #define FMAC_I2 fmacs
 
 #elif defined(NC) || defined(TC)
 
        #define KMAC_R  fmacs
-       #define KMAC_I  fnmacs
+       #define KMAC_I  vmls.f32
 
        #define FMAC_R1 fmacs
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
+       #define FMAC_I1 vmls.f32
        #define FMAC_I2 fmacs
 
 #else
 
-       #define KMAC_R  fnmacs
+       #define KMAC_R  vmls.f32
        #define KMAC_I  fmacs
 
        #define FMAC_R1 fmacs
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
+       #define FMAC_I1 vmls.f32
        #define FMAC_I2 fmacs
 
 #endif

diff --git a/kernel/arm/cgemm_kernel_2x2_vfpv3.S b/kernel/arm/cgemm_kernel_2x2_vfpv3.S
index cf132a1..16c00ad 100644 (file)
--- a/kernel/arm/cgemm_kernel_2x2_vfpv3.S
+++ b/kernel/arm/cgemm_kernel_2x2_vfpv3.S
@@ -106,10 +106,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubs
        #define FADD_I  fadds
 
-       #define FMAC_R1 fnmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R1 vmls.f32
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
-       #define FMAC_I2 fnmacs
+       #define FMAC_I2 vmls.f32
 
 #elif defined(CN) || defined(CT)
 
@@ -118,7 +118,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        #define FMAC_R1 fmacs
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
+       #define FMAC_I1 vmls.f32
        #define FMAC_I2 fmacs
 
 #elif defined(NC) || defined(TC)
@@ -127,7 +127,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_I  fsubs
 
        #define FMAC_R1 fmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
        #define FMAC_I2 fmacs
 
@@ -136,10 +136,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubs
        #define FADD_I  fadds
 
-       #define FMAC_R1 fnmacs
+       #define FMAC_R1 vmls.f32
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
-       #define FMAC_I2 fnmacs
+       #define FMAC_I1 vmls.f32
+       #define FMAC_I2 vmls.f32
 
 #endif
 

diff --git a/kernel/arm/cgemv_n_vfp.S b/kernel/arm/cgemv_n_vfp.S
index 5d27486..a9040e7 100644 (file)
--- a/kernel/arm/cgemv_n_vfp.S
+++ b/kernel/arm/cgemv_n_vfp.S
@@ -78,42 +78,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(CONJ) && !defined(XCONJ)
 
-        #define KMAC_R  fnmacs
+        #define KMAC_R  vmls.f32
         #define KMAC_I  fmacs
 
         #define FMAC_R1 fmacs
-        #define FMAC_R2 fnmacs
+        #define FMAC_R2 vmls.f32
         #define FMAC_I1 fmacs
         #define FMAC_I2 fmacs
 
 #elif defined(CONJ) && !defined(XCONJ)
 
         #define KMAC_R  fmacs
-        #define KMAC_I  fnmacs
+        #define KMAC_I  vmls.f32
 
         #define FMAC_R1 fmacs
-        #define FMAC_R2 fnmacs
+        #define FMAC_R2 vmls.f32
         #define FMAC_I1 fmacs
         #define FMAC_I2 fmacs
 
 #elif !defined(CONJ) && defined(XCONJ)
 
         #define KMAC_R  fmacs
-        #define KMAC_I  fnmacs
+        #define KMAC_I  vmls.f32
 
         #define FMAC_R1 fmacs
         #define FMAC_R2 fmacs
-        #define FMAC_I1 fnmacs
+        #define FMAC_I1 vmls.f32
         #define FMAC_I2 fmacs
 
 #else
 
-        #define KMAC_R  fnmacs
+        #define KMAC_R  vmls.f32
         #define KMAC_I  fmacs
 
         #define FMAC_R1 fmacs
         #define FMAC_R2 fmacs
-        #define FMAC_I1 fnmacs
+        #define FMAC_I1 vmls.f32
         #define FMAC_I2 fmacs
 
 #endif

diff --git a/kernel/arm/cgemv_t_vfp.S b/kernel/arm/cgemv_t_vfp.S
index 76c8a8f..56451c5 100644 (file)
--- a/kernel/arm/cgemv_t_vfp.S
+++ b/kernel/arm/cgemv_t_vfp.S
@@ -76,42 +76,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(CONJ) && !defined(XCONJ)
 
-        #define KMAC_R  fnmacs
+        #define KMAC_R  vmls.f32
         #define KMAC_I  fmacs
 
         #define FMAC_R1 fmacs
-        #define FMAC_R2 fnmacs
+        #define FMAC_R2 vmls.f32
         #define FMAC_I1 fmacs
         #define FMAC_I2 fmacs
 
 #elif defined(CONJ) && !defined(XCONJ)
 
         #define KMAC_R  fmacs
-        #define KMAC_I  fnmacs
+        #define KMAC_I  vmls.f32
 
         #define FMAC_R1 fmacs
-        #define FMAC_R2 fnmacs
+        #define FMAC_R2 vmls.f32
         #define FMAC_I1 fmacs
         #define FMAC_I2 fmacs
 
 #elif !defined(CONJ) && defined(XCONJ)
 
         #define KMAC_R  fmacs
-        #define KMAC_I  fnmacs
+        #define KMAC_I  vmls.f32
 
         #define FMAC_R1 fmacs
         #define FMAC_R2 fmacs
-        #define FMAC_I1 fnmacs
+        #define FMAC_I1 vmls.f32
         #define FMAC_I2 fmacs
 
 #else
 
-        #define KMAC_R  fnmacs
+        #define KMAC_R  vmls.f32
         #define KMAC_I  fmacs
 
         #define FMAC_R1 fmacs
         #define FMAC_R2 fmacs
-        #define FMAC_I1 fnmacs
+        #define FMAC_I1 vmls.f32
         #define FMAC_I2 fmacs
 
 #endif

diff --git a/kernel/arm/ctrmm_kernel_2x2_vfp.S b/kernel/arm/ctrmm_kernel_2x2_vfp.S
index 8cb7ede..5079844 100644 (file)
--- a/kernel/arm/ctrmm_kernel_2x2_vfp.S
+++ b/kernel/arm/ctrmm_kernel_2x2_vfp.S
@@ -98,42 +98,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(NN) || defined(NT) || defined(TN) || defined(TT)
 
-       #define KMAC_R  fnmacs
+       #define KMAC_R  vmls.f32
        #define KMAC_I  fmacs
 
        #define FMAC_R1 fmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
        #define FMAC_I2 fmacs
 
 #elif defined(CN) || defined(CT)
 
        #define KMAC_R  fmacs
-       #define KMAC_I  fnmacs
+       #define KMAC_I  vmls.f32
 
        #define FMAC_R1 fmacs
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmacs
        #define FMAC_I2 fmacs
 
 #elif defined(NC) || defined(TC)
 
        #define KMAC_R  fmacs
-       #define KMAC_I  fnmacs
+       #define KMAC_I  vmls.f32
 
        #define FMAC_R1 fmacs
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
+       #define FMAC_I1 vmls.f32
        #define FMAC_I2 fmacs
 
 #else
 
-       #define KMAC_R  fnmacs
+       #define KMAC_R  vmls.f32
        #define KMAC_I  fmacs
 
        #define FMAC_R1 fmacs
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmacs
+       #define FMAC_I1 vmls.f32
        #define FMAC_I2 fmacs
 
 #endif

diff --git a/kernel/arm/ctrmm_kernel_2x2_vfpv3.S b/kernel/arm/ctrmm_kernel_2x2_vfpv3.S
index 97bd88c..ef7e58f 100644 (file)
--- a/kernel/arm/ctrmm_kernel_2x2_vfpv3.S
+++ b/kernel/arm/ctrmm_kernel_2x2_vfpv3.S
@@ -93,10 +93,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubs
        #define FADD_I  fadds
 
-       #define FMAC_R1 fnmuls
-       #define FMAC_R2 fnmacs
+       #define FMAC_R1 vnmul.f32
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmuls
-       #define FMAC_I2 fnmacs
+       #define FMAC_I2 vmls.f32
 
 #elif defined(CN) || defined(CT)
 
@@ -105,7 +105,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        #define FMAC_R1 fmuls
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmuls
+       #define FMAC_I1 vnmul.f32
        #define FMAC_I2 fmacs
 
 #elif defined(NC) || defined(TC)
@@ -114,7 +114,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_I  fsubs
 
        #define FMAC_R1 fmuls
-       #define FMAC_R2 fnmacs
+       #define FMAC_R2 vmls.f32
        #define FMAC_I1 fmuls
        #define FMAC_I2 fmacs
 
@@ -123,10 +123,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubs
        #define FADD_I  fadds
 
-       #define FMAC_R1 fnmuls
+       #define FMAC_R1 vnmul.f32
        #define FMAC_R2 fmacs
-       #define FMAC_I1 fnmuls
-       #define FMAC_I2 fnmacs
+       #define FMAC_I1 vnmul.f32
+       #define FMAC_I2 vmls.f32
 
 #endif
 

diff --git a/kernel/arm/rot_vfp.S b/kernel/arm/rot_vfp.S
index d053423..0d1067c 100644 (file)
--- a/kernel/arm/rot_vfp.S
+++ b/kernel/arm/rot_vfp.S
@@ -73,7 +73,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -82,7 +82,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -91,7 +91,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -100,7 +100,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -114,7 +114,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -127,7 +127,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d5
        vmul.f64    d3 , d0, d5
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X, { d2 }
        fstmiad Y, { d3 }
 
@@ -145,7 +145,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -154,7 +154,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -163,7 +163,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -172,7 +172,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -186,7 +186,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -199,7 +199,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s5
        vmul.f32    s3 , s0, s5
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X, { s2 }
        fstmias Y, { s3 }
 
@@ -226,13 +226,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -241,13 +241,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -259,13 +259,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -274,13 +274,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -294,13 +294,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        fstmiad X!, { d2 }
        fstmiad Y!, { d3 }
 
@@ -314,13 +314,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f64    d2 , d0, d4
        fmacd       d2 , d1, d6
        vmul.f64    d3 , d0, d6
-       fnmacd      d3 , d1, d4
+       vmls.f64    d3 , d1, d4
        vstr        d2 , [ X, #0 ]
        vstr        d3 , [ Y, #0 ]
        vmul.f64    d2 , d0, d5
        fmacd       d2 , d1, d7
        vmul.f64    d3 , d0, d7
-       fnmacd      d3 , d1, d5
+       vmls.f64    d3 , d1, d5
        vstr        d2 , [ X, #8 ]
        vstr        d3 , [ Y, #8 ]
 
@@ -343,13 +343,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -358,13 +358,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -376,13 +376,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -391,13 +391,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -411,13 +411,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        fstmias X!, { s2 }
        fstmias Y!, { s3 }
 
@@ -431,13 +431,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        vmul.f32    s2 , s0, s4
        fmacs       s2 , s1, s6
        vmul.f32    s3 , s0, s6
-       fnmacs      s3 , s1, s4
+       vmls.f32    s3 , s1, s4
        vstr        s2 , [ X, #0 ]
        vstr        s3 , [ Y, #0 ]
        vmul.f32    s2 , s0, s5
        fmacs       s2 , s1, s7
        vmul.f32    s3 , s0, s7
-       fnmacs      s3 , s1, s5
+       vmls.f32    s3 , s1, s5
        vstr        s2 , [ X, #4 ]
        vstr        s3 , [ Y, #4 ]
 

diff --git a/kernel/arm/scal_vfp.S b/kernel/arm/scal_vfp.S
index a8939c3..cc3e3b9 100644 (file)
--- a/kernel/arm/scal_vfp.S
+++ b/kernel/arm/scal_vfp.S
@@ -138,14 +138,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X!, { d2 - d3 }
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X!, { d2 - d3 }
@@ -154,14 +154,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X!, { d2 - d3 }
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X!, { d2 - d3 }
@@ -173,7 +173,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X!, { d2 - d3 }
@@ -184,7 +184,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmiad X,  { d4 - d5 }
        vmul.f64    d2, d0, d4
-       fnmacd     d2, d1, d5
+       vmls.f64    d2, d1, d5
        vmul.f64    d3, d0, d5
        fmacd      d3, d1, d4
        fstmiad X, { d2 - d3 }
@@ -201,28 +201,28 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X!, { s2 - s3 }
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X!, { s2 - s3 }
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X!, { s2 - s3 }
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X!, { s2 - s3 }
@@ -234,7 +234,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X!, { s2 - s3 }
@@ -245,7 +245,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        fldmias X,  { s4 - s5 }
        vmul.f32    s2, s0, s4
-       fnmacs     s2, s1, s5
+       vmls.f32    s2, s1, s5
        vmul.f32    s3, s0, s5
        fmacs      s3, s1, s4
        fstmias X, { s2 - s3 }

diff --git a/kernel/arm/zgemm_kernel_2x2_vfp.S b/kernel/arm/zgemm_kernel_2x2_vfp.S
index 46507c4..6aeb6c7 100644 (file)
--- a/kernel/arm/zgemm_kernel_2x2_vfp.S
+++ b/kernel/arm/zgemm_kernel_2x2_vfp.S
@@ -87,42 +87,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(NN) || defined(NT) || defined(TN) || defined(TT)
 
-       #define KMAC_R  fnmacd
+       #define KMAC_R  vmls.f64
        #define KMAC_I  fmacd
 
        #define FMAC_R1 fmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
        #define FMAC_I2 fmacd
 
 #elif defined(CN) || defined(CT)
 
        #define KMAC_R  fmacd
-       #define KMAC_I  fnmacd
+       #define KMAC_I  vmls.f64
 
        #define FMAC_R1 fmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
        #define FMAC_I2 fmacd
 
 #elif defined(NC) || defined(TC)
 
        #define KMAC_R  fmacd
-       #define KMAC_I  fnmacd
+       #define KMAC_I  vmls.f64
 
        #define FMAC_R1 fmacd
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
+       #define FMAC_I1 vmls.f64
        #define FMAC_I2 fmacd
 
 #else
 
-       #define KMAC_R  fnmacd
+       #define KMAC_R  vmls.f64
        #define KMAC_I  fmacd
 
        #define FMAC_R1 fmacd
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
+       #define FMAC_I1 vmls.f64
        #define FMAC_I2 fmacd
 
 #endif

diff --git a/kernel/arm/zgemm_kernel_2x2_vfpv3.S b/kernel/arm/zgemm_kernel_2x2_vfpv3.S
index 5a99f79..10c83e3 100644 (file)
--- a/kernel/arm/zgemm_kernel_2x2_vfpv3.S
+++ b/kernel/arm/zgemm_kernel_2x2_vfpv3.S
@@ -106,10 +106,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubd
        #define FADD_I  faddd
 
-       #define FMAC_R1 fnmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R1 vmls.f64
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
-       #define FMAC_I2 fnmacd
+       #define FMAC_I2 vmls.f64
 
 #elif defined(CN) || defined(CT)
 
@@ -118,7 +118,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        #define FMAC_R1 fmacd
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
+       #define FMAC_I1 vmls.f64
        #define FMAC_I2 fmacd
 
 #elif defined(NC) || defined(TC)
@@ -127,7 +127,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_I  fsubd
 
        #define FMAC_R1 fmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
        #define FMAC_I2 fmacd
 
@@ -136,10 +136,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubd
        #define FADD_I  faddd
 
-       #define FMAC_R1 fnmacd
+       #define FMAC_R1 vmls.f64
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
-       #define FMAC_I2 fnmacd
+       #define FMAC_I1 vmls.f64
+       #define FMAC_I2 vmls.f64
 
 #endif
 

diff --git a/kernel/arm/zgemv_n_vfp.S b/kernel/arm/zgemv_n_vfp.S
index da9a910..cba5956 100644 (file)
--- a/kernel/arm/zgemv_n_vfp.S
+++ b/kernel/arm/zgemv_n_vfp.S
@@ -79,42 +79,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(CONJ) && !defined(XCONJ)
 
-        #define KMAC_R  fnmacd
+        #define KMAC_R  vmls.f64
         #define KMAC_I  fmacd
 
         #define FMAC_R1 fmacd
-        #define FMAC_R2 fnmacd
+        #define FMAC_R2 vmls.f64
         #define FMAC_I1 fmacd
         #define FMAC_I2 fmacd
 
 #elif defined(CONJ) && !defined(XCONJ)
 
         #define KMAC_R  fmacd
-        #define KMAC_I  fnmacd
+        #define KMAC_I  vmls.f64
 
         #define FMAC_R1 fmacd
-        #define FMAC_R2 fnmacd
+        #define FMAC_R2 vmls.f64
         #define FMAC_I1 fmacd
         #define FMAC_I2 fmacd
 
 #elif !defined(CONJ) && defined(XCONJ)
 
         #define KMAC_R  fmacd
-        #define KMAC_I  fnmacd
+        #define KMAC_I  vmls.f64
 
         #define FMAC_R1 fmacd
         #define FMAC_R2 fmacd
-        #define FMAC_I1 fnmacd
+        #define FMAC_I1 vmls.f64
         #define FMAC_I2 fmacd
 
 #else
 
-        #define KMAC_R  fnmacd
+        #define KMAC_R  vmls.f64
         #define KMAC_I  fmacd
 
         #define FMAC_R1 fmacd
         #define FMAC_R2 fmacd
-        #define FMAC_I1 fnmacd
+        #define FMAC_I1 vmls.f64
         #define FMAC_I2 fmacd
 
 #endif

diff --git a/kernel/arm/zgemv_t_vfp.S b/kernel/arm/zgemv_t_vfp.S
index 211fa07..b11c080 100644 (file)
--- a/kernel/arm/zgemv_t_vfp.S
+++ b/kernel/arm/zgemv_t_vfp.S
@@ -77,42 +77,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(CONJ) && !defined(XCONJ)
 
-        #define KMAC_R  fnmacd
+        #define KMAC_R  vmls.f64
         #define KMAC_I  fmacd
 
         #define FMAC_R1 fmacd
-        #define FMAC_R2 fnmacd
+        #define FMAC_R2 vmls.f64
         #define FMAC_I1 fmacd
         #define FMAC_I2 fmacd
 
 #elif defined(CONJ) && !defined(XCONJ)
 
         #define KMAC_R  fmacd
-        #define KMAC_I  fnmacd
+        #define KMAC_I  vmls.f64
 
         #define FMAC_R1 fmacd
-        #define FMAC_R2 fnmacd
+        #define FMAC_R2 vmls.f64
         #define FMAC_I1 fmacd
         #define FMAC_I2 fmacd
 
 #elif !defined(CONJ) && defined(XCONJ)
 
         #define KMAC_R  fmacd
-        #define KMAC_I  fnmacd
+        #define KMAC_I  vmls.f64
 
         #define FMAC_R1 fmacd
         #define FMAC_R2 fmacd
-        #define FMAC_I1 fnmacd
+        #define FMAC_I1 vmls.f64
         #define FMAC_I2 fmacd
 
 #else
 
-        #define KMAC_R  fnmacd
+        #define KMAC_R  vmls.f64
         #define KMAC_I  fmacd
 
         #define FMAC_R1 fmacd
         #define FMAC_R2 fmacd
-        #define FMAC_I1 fnmacd
+        #define FMAC_I1 vmls.f64
         #define FMAC_I2 fmacd
 
 #endif

diff --git a/kernel/arm/ztrmm_kernel_2x2_vfp.S b/kernel/arm/ztrmm_kernel_2x2_vfp.S
index dc80b17..f412dfc 100644 (file)
--- a/kernel/arm/ztrmm_kernel_2x2_vfp.S
+++ b/kernel/arm/ztrmm_kernel_2x2_vfp.S
@@ -96,42 +96,42 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(NN) || defined(NT) || defined(TN) || defined(TT)
 
-       #define KMAC_R  fnmacd
+       #define KMAC_R  vmls.f64
        #define KMAC_I  fmacd
 
        #define FMAC_R1 fmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
        #define FMAC_I2 fmacd
 
 #elif defined(CN) || defined(CT)
 
        #define KMAC_R  fmacd
-       #define KMAC_I  fnmacd
+       #define KMAC_I  vmls.f64
 
        #define FMAC_R1 fmacd
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmacd
        #define FMAC_I2 fmacd
 
 #elif defined(NC) || defined(TC)
 
        #define KMAC_R  fmacd
-       #define KMAC_I  fnmacd
+       #define KMAC_I  vmls.f64
 
        #define FMAC_R1 fmacd
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
+       #define FMAC_I1 vmls.f64
        #define FMAC_I2 fmacd
 
 #else
 
-       #define KMAC_R  fnmacd
+       #define KMAC_R  vmls.f64
        #define KMAC_I  fmacd
 
        #define FMAC_R1 fmacd
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmacd
+       #define FMAC_I1 vmls.f64
        #define FMAC_I2 fmacd
 
 #endif

diff --git a/kernel/arm/ztrmm_kernel_2x2_vfpv3.S b/kernel/arm/ztrmm_kernel_2x2_vfpv3.S
index 5a808cc..92370bb 100644 (file)
--- a/kernel/arm/ztrmm_kernel_2x2_vfpv3.S
+++ b/kernel/arm/ztrmm_kernel_2x2_vfpv3.S
@@ -93,10 +93,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubd
        #define FADD_I  faddd
 
-       #define FMAC_R1 fnmuld
-       #define FMAC_R2 fnmacd
+       #define FMAC_R1 vnmul.f64
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmuld
-       #define FMAC_I2 fnmacd
+       #define FMAC_I2 vmls.f64
 
 #elif defined(CN) || defined(CT)
 
@@ -105,7 +105,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
        #define FMAC_R1 fmuld
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmuld
+       #define FMAC_I1 vnmul.f64
        #define FMAC_I2 fmacd
 
 #elif defined(NC) || defined(TC)
@@ -114,7 +114,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_I  fsubd
 
        #define FMAC_R1 fmuld
-       #define FMAC_R2 fnmacd
+       #define FMAC_R2 vmls.f64
        #define FMAC_I1 fmuld
        #define FMAC_I2 fmacd
 
@@ -123,10 +123,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        #define FADD_R  fsubd
        #define FADD_I  faddd
 
-       #define FMAC_R1 fnmuld
+       #define FMAC_R1 vnmul.f64
        #define FMAC_R2 fmacd
-       #define FMAC_I1 fnmuld
-       #define FMAC_I2 fnmacd
+       #define FMAC_I1 vnmul.f64
+       #define FMAC_I2 vmls.f64
 
 #endif