S/390: z13: Accept vector alignment hints

Accept vector alignment hints on z13 although they are ignored there.
The advantage is that any binary compiled for architecture level z13 may
run on z14 or later and benefit from vector alignment hints.

Backport from mainline.

gas/ChangeLog:

2020-05-18  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>

	* testsuite/gas/s390/zarch-z13.d: Add regexp checks for vector
	load/store instruction variants with alignment hints.
	* testsuite/gas/s390/zarch-z13.s: Emit new vector load/store
	instruction variants with alignment hints.

opcodes/ChangeLog:

2020-05-18  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>

	* s390-opc.txt: Relocate vector load/store instructions with
	additional alignment parameter and change architecture level
	constraint from z14 to z13.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 92957f531baea352e2bd904f9664263b2cf94872..5eb92e3383e8a1daccdc0e608996f38884a6e8b9 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2020-07-06  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>
+
+       Backport from mainline.
+       2020-05-26  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>
+
+       * testsuite/gas/s390/zarch-z13.d: Add regexp checks for vector
+       load/store instruction variants with alignment hints.
+       * testsuite/gas/s390/zarch-z13.s: Emit new vector load/store
+       instruction variants with alignment hints.
+
 2020-06-10  Alex Coplan  <alex.coplan@arm.com>
 
        Backport from master

diff --git a/gas/testsuite/gas/s390/zarch-z13.d b/gas/testsuite/gas/s390/zarch-z13.d
index e61352b8e2f52e2f651db57e403698790eabb63d..bfb6fe1ba83c93a3a99a65241225904c4dc405df 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z13.d
+++ b/gas/testsuite/gas/s390/zarch-z13.d
@@ -17,7 +17,6 @@ Disassembly of section .text:
 .*:    e7 f0 fd fc 10 46 [     ]*vgmh  %v15,253,252
 .*:    e7 f0 fd fc 20 46 [     ]*vgmf  %v15,253,252
 .*:    e7 f0 fd fc 30 46 [     ]*vgmg  %v15,253,252
-.*:    e7 f6 9f a0 00 06 [     ]*vl    %v15,4000\(%r6,%r9\)
 .*:    e7 f1 00 00 04 56 [     ]*vlr   %v15,%v17
 .*:    e7 f6 9f a0 d0 05 [     ]*vlrep %v15,4000\(%r6,%r9\),13
 .*:    e7 f6 9f a0 00 05 [     ]*vlrepb        %v15,4000\(%r6,%r9\)
@@ -42,7 +41,6 @@ Disassembly of section .text:
 .*:    e7 f6 9f a0 10 04 [     ]*vllezh        %v15,4000\(%r6,%r9\)
 .*:    e7 f6 9f a0 20 04 [     ]*vllezf        %v15,4000\(%r6,%r9\)
 .*:    e7 f6 9f a0 30 04 [     ]*vllezg        %v15,4000\(%r6,%r9\)
-.*:    e7 f1 6f a0 04 36 [     ]*vlm   %v15,%v17,4000\(%r6\)
 .*:    e7 f6 9f a0 d0 07 [     ]*vlbb  %v15,4000\(%r6,%r9\),13
 .*:    e7 f6 9f a0 d0 22 [     ]*vlvg  %v15,%r6,4000\(%r9\),13
 .*:    e7 f6 9f a0 00 22 [     ]*vlvgb %v15,%r6,4000\(%r9\)
@@ -98,12 +96,10 @@ Disassembly of section .text:
 .*:    e7 f1 00 00 04 5f [     ]*vsegb %v15,%v17
 .*:    e7 f1 00 00 14 5f [     ]*vsegh %v15,%v17
 .*:    e7 f1 00 00 24 5f [     ]*vsegf %v15,%v17
-.*:    e7 f6 9f a0 00 0e [     ]*vst   %v15,4000\(%r6,%r9\)
 .*:    e7 f6 9f a0 d0 08 [     ]*vsteb %v15,4000\(%r6,%r9\),13
 .*:    e7 f6 9f a0 d0 09 [     ]*vsteh %v15,4000\(%r6,%r9\),13
 .*:    e7 f6 9f a0 d0 0b [     ]*vstef %v15,4000\(%r6,%r9\),13
 .*:    e7 f6 9f a0 d0 0a [     ]*vsteg %v15,4000\(%r6,%r9\),13
-.*:    e7 f1 6f a0 04 3e [     ]*vstm  %v15,%v17,4000\(%r6\)
 .*:    e7 f6 9f a0 00 3f [     ]*vstl  %v15,%r6,4000\(%r9\)
 .*:    e7 f1 00 00 d4 d7 [     ]*vuph  %v15,%v17,13
 .*:    e7 f1 00 00 04 d7 [     ]*vuphb %v15,%v17
@@ -680,3 +676,11 @@ Disassembly of section .text:
 .*:    e3 69 b8 f0 fd 3b [     ]*lzrf  %r6,-10000\(%r9,%r11\)
 .*:    e3 69 b8 f0 fd 2a [     ]*lzrg  %r6,-10000\(%r9,%r11\)
 .*:    b9 3c 00 69 [   ]*prno  %r6,%r9
+.*:    e7 f6 9f a0 00 06 [     ]*vl    %v15,4000\(%r6,%r9\)
+.*:    e7 f6 9f a0 d0 06 [     ]*vl    %v15,4000\(%r6,%r9\),13
+.*:    e7 f1 6f a0 04 36 [     ]*vlm   %v15,%v17,4000\(%r6\)
+.*:    e7 f1 6f a0 d4 36 [     ]*vlm   %v15,%v17,4000\(%r6\),13
+.*:    e7 f6 9f a0 00 0e [     ]*vst   %v15,4000\(%r6,%r9\)
+.*:    e7 f6 9f a0 d0 0e [     ]*vst   %v15,4000\(%r6,%r9\),13
+.*:    e7 f1 6f a0 04 3e [     ]*vstm  %v15,%v17,4000\(%r6\)
+.*:    e7 f1 6f a0 d4 3e [     ]*vstm  %v15,%v17,4000\(%r6\),13

diff --git a/gas/testsuite/gas/s390/zarch-z13.s b/gas/testsuite/gas/s390/zarch-z13.s
index c2964d8297fbd84e1d247266c0d0d132b8a2f13e..646dd3097fb37044a79971814d5343befc64ff2a 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z13.s
+++ b/gas/testsuite/gas/s390/zarch-z13.s
@@ -11,7 +11,6 @@ foo:
        vgmh    %v15,253,252
        vgmf    %v15,253,252
        vgmg    %v15,253,252
-       vl      %v15,4000(%r6,%r9)
        vlr     %v15,%v17
        vlrep   %v15,4000(%r6,%r9),13
        vlrepb  %v15,4000(%r6,%r9)
@@ -36,7 +35,6 @@ foo:
        vllezh  %v15,4000(%r6,%r9)
        vllezf  %v15,4000(%r6,%r9)
        vllezg  %v15,4000(%r6,%r9)
-       vlm     %v15,%v17,4000(%r6)
        vlbb    %v15,4000(%r6,%r9),13
        vlvg    %v15,%r6,4000(%r9),13
        vlvgb   %v15,%r6,4000(%r9)
@@ -92,12 +90,10 @@ foo:
        vsegb   %v15,%v17
        vsegh   %v15,%v17
        vsegf   %v15,%v17
-       vst     %v15,4000(%r6,%r9)
        vsteb   %v15,4000(%r6,%r9),13
        vsteh   %v15,4000(%r6,%r9),13
        vstef   %v15,4000(%r6,%r9),13
        vsteg   %v15,4000(%r6,%r9),13
-       vstm    %v15,%v17,4000(%r6)
        vstl    %v15,%r6,4000(%r9)
        vuph    %v15,%v17,13
        vuphb   %v15,%v17
@@ -674,3 +670,11 @@ foo:
        lzrf    %r6,-10000(%r9,%r11)
        lzrg    %r6,-10000(%r9,%r11)
        ppno    %r6,%r9
+       vl              %v15,4000(%r6,%r9)
+       vl              %v15,4000(%r6,%r9),13
+       vlm             %v15,%v17,4000(%r6)
+       vlm             %v15,%v17,4000(%r6),13
+       vst             %v15,4000(%r6,%r9)
+       vst             %v15,4000(%r6,%r9),13
+       vstm            %v15,%v17,4000(%r6)
+       vstm            %v15,%v17,4000(%r6),13

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ee75d098d987ce3d171da26a16a269220a36c164..982454e421ea1a7b34969ffa0853472aab5dd666 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,12 @@
+2020-07-06  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>
+
+       Backport from mainline.
+       2020-05-26  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>
+
+       * s390-opc.txt: Relocate vector load/store instructions with
+       additional alignment parameter and change architecture level
+       constraint from z14 to z13.
+
 2020-02-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gas/25516

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index a95b87127b4e773ffffbd836216d1a570f806215..33dbeb3824977f9bc8c073302b9f809f99293b93 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -1159,7 +1159,6 @@ e70000000046 vgmb VRI_V0UU "vector generate mask byte" z13 zarch vx
 e70000001046 vgmh VRI_V0UU "vector generate mask halfword" z13 zarch vx
 e70000002046 vgmf VRI_V0UU "vector generate mask word" z13 zarch vx
 e70000003046 vgmg VRI_V0UU "vector generate mask double word" z13 zarch vx
-e70000000006 vl VRX_VRRD "vector memory load" z13 zarch vx
 e70000000056 vlr VRX_VV "vector register load" z13 zarch vx
 e70000000005 vlrep VRX_VRRDU "vector load and replicate" z13 zarch vx
 e70000000005 vlrepb VRX_VRRD "vector load and replicate byte elements" z13 zarch vx
@@ -1184,7 +1183,6 @@ e70000000004 vllezb VRX_VRRD "vector load logical byte element and zero" z13 zar
 e70000001004 vllezh VRX_VRRD "vector load logical halfword element and zero" z13 zarch vx
 e70000002004 vllezf VRX_VRRD "vector load logical word element and zero" z13 zarch vx
 e70000003004 vllezg VRX_VRRD "vector load logical double word element and zero" z13 zarch vx
-e70000000036 vlm VRS_VVRD "vector load multiple" z13 zarch vx
 e70000000007 vlbb VRX_VRRDU "vector load to block boundary" z13 zarch vx
 e70000000022 vlvg VRS_VRRDU "vector load VR element from GR" z13 zarch vx
 e70000000022 vlvgb VRS_VRRD "vector load VR byte element from GR" z13 zarch vx
@@ -1240,12 +1238,10 @@ e7000000005f vseg VRR_VV0U "vector sign extend to double word" z13 zarch vx
 e7000000005f vsegb VRR_VV "vector sign extend byte to double word" z13 zarch vx
 e7000000105f vsegh VRR_VV "vector sign extend halfword to double word" z13 zarch vx
 e7000000205f vsegf VRR_VV "vector sign extend word to double word" z13 zarch vx
-e7000000000e vst VRX_VRRD "vector store" z13 zarch vx
 e70000000008 vsteb VRX_VRRDU "vector store byte element" z13 zarch vx
 e70000000009 vsteh VRX_VRRDU "vector store halfword element" z13 zarch vx
 e7000000000b vstef VRX_VRRDU "vector store word element" z13 zarch vx
 e7000000000a vsteg VRX_VRRDU "vector store double word element" z13 zarch vx
-e7000000003e vstm VRS_VVRD "vector store multiple" z13 zarch vx
 e7000000003f vstl VRS_VRRD "vector store with length" z13 zarch vx
 e700000000d7 vuph VRR_VV0U "vector unpack high" z13 zarch vx
 e700000000d7 vuphb VRR_VV "vector unpack high byte" z13 zarch vx
@@ -1680,6 +1676,13 @@ e3000000003b lzrf RXY_RRRD "load and zero rightmost byte 32->32" z13 zarch
 e3000000002a lzrg RXY_RRRD "load and zero rightmost byte 64->64" z13 zarch
 b93c ppno RRE_RR "perform pseudorandom number operation" z13 zarch
 
+# Aligned vector store hints
+
+e70000000006 vl VRX_VRRDU "vector memory load" z13 zarch optparm,vx
+e70000000036 vlm VRS_VVRDU "vector load multiple" z13 zarch optparm,vx
+e7000000000e vst VRX_VRRDU "vector store" z13 zarch optparm,vx
+e7000000003e vstm VRS_VVRDU "vector store multiple" z13 zarch optparm,vx
+
 # arch12 instructions
 
 # Vector Enhancements Facility 1
@@ -1881,14 +1884,6 @@ b93c prno RRE_RR "perform pseudorandom number operation" arch12 zarch
 b9a1 tpei RRE_RR "test pending external interruption" arch12 zarch
 b9ac irbm RRE_RR "insert reference bits multiple" arch12 zarch
 
-# Aligned vector store hints
-
-e70000000006 vl VRX_VRRDU "vector memory load" arch12 zarch optparm
-e70000000036 vlm VRS_VVRDU "vector load multiple" arch12 zarch optparm
-e7000000000e vst VRX_VRRDU "vector store" arch12 zarch optparm
-e7000000003e vstm VRS_VVRDU "vector store multiple" arch12 zarch optparm
-
-
 # arch13 instructions