[Gmp-commit] /var/hg/gmp: Revert "Move popcount and hamdist back from z14 to ...

mercurial at gmplib.org mercurial at gmplib.org
Thu Aug 3 16:18:36 CEST 2023


details:   /var/hg/gmp/rev/372acfd0c33e
changeset: 18421:372acfd0c33e
user:      Stefan Liebler <stli at linux.ibm.com>
date:      Thu Aug 03 16:18:17 2023 +0200
description:
Revert "Move popcount and hamdist back from z14 to z13 after needed edits."

diffstat:

 mpn/s390_64/z13/hamdist.asm  |  76 --------------------------------------------
 mpn/s390_64/z13/popcount.asm |  69 ---------------------------------------
 mpn/s390_64/z14/hamdist.asm  |  76 ++++++++++++++++++++++++++++++++++++++++++++
 mpn/s390_64/z14/popcount.asm |  69 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 145 deletions(-)

diffs (truncated from 306 to 300 lines):

diff -r b84cfb2ca5df -r 372acfd0c33e mpn/s390_64/z13/hamdist.asm
--- a/mpn/s390_64/z13/hamdist.asm	Mon Jul 31 16:01:09 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-dnl  S/390-64 mpn_hamdist
-
-dnl  Copyright 2023 Free Software Foundation, Inc.
-
-dnl  This file is part of the GNU MP Library.
-dnl
-dnl  The GNU MP Library is free software; you can redistribute it and/or modify
-dnl  it under the terms of either:
-dnl
-dnl    * the GNU Lesser General Public License as published by the Free
-dnl      Software Foundation; either version 3 of the License, or (at your
-dnl      option) any later version.
-dnl
-dnl  or
-dnl
-dnl    * the GNU General Public License as published by the Free Software
-dnl      Foundation; either version 2 of the License, or (at your option) any
-dnl      later version.
-dnl
-dnl  or both in parallel, as here.
-dnl
-dnl  The GNU MP Library is distributed in the hope that it will be useful, but
-dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-dnl  for more details.
-dnl
-dnl  You should have received copies of the GNU General Public License and the
-dnl  GNU Lesser General Public License along with the GNU MP Library.  If not,
-dnl  see https://www.gnu.org/licenses/.
-
-include(`../config.m4')
-
-C            cycles/limb
-C z900		 -
-C z990		 -
-C z9		 -
-C z10		 -
-C z196		 -
-C z12		 ?
-C z13		 ?
-C z14		 ?
-C z15		 ?
-
-define(`ap',	`%r2')
-define(`bp',	`%r3')
-define(`n',	`%r4')
-
-ASM_START()
-PROLOGUE(mpn_hamdist)
-	vzero	%v30
-	tmll	n, 1
-	srlg	n, n, 1
-	je	L(top)
-
-L(odd):	vllezg	%v16, 0(ap)
-	vllezg	%v17, 0(bp)
-	vx	%v16, %v16, %v17
-	vpopct	%v30, %v16, 3
-	la	ap, 8(ap)
-	la	bp, 8(bp)
-	clgije	n, 0, L(end)
-
-L(top):	vl	%v16, 0(ap), 3
-	vl	%v17, 0(bp), 3
-	vx	%v16, %v16, %v17
-	vpopct	%v20, %v16, 3
-	vag	%v30, %v30, %v20
-	la	ap, 16(ap)
-	la	bp, 16(bp)
-	brctg	n, L(top)
-
-L(end):	vzero	%v29
-	vsumqg	%v30, %v30, %v29
-	vlgvg	%r2, %v30, 1(%r0)
-	br	%r14
-EPILOGUE()
diff -r b84cfb2ca5df -r 372acfd0c33e mpn/s390_64/z13/popcount.asm
--- a/mpn/s390_64/z13/popcount.asm	Mon Jul 31 16:01:09 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-dnl  S/390-64 mpn_popcount
-
-dnl  Copyright 2023 Free Software Foundation, Inc.
-
-dnl  This file is part of the GNU MP Library.
-dnl
-dnl  The GNU MP Library is free software; you can redistribute it and/or modify
-dnl  it under the terms of either:
-dnl
-dnl    * the GNU Lesser General Public License as published by the Free
-dnl      Software Foundation; either version 3 of the License, or (at your
-dnl      option) any later version.
-dnl
-dnl  or
-dnl
-dnl    * the GNU General Public License as published by the Free Software
-dnl      Foundation; either version 2 of the License, or (at your option) any
-dnl      later version.
-dnl
-dnl  or both in parallel, as here.
-dnl
-dnl  The GNU MP Library is distributed in the hope that it will be useful, but
-dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-dnl  for more details.
-dnl
-dnl  You should have received copies of the GNU General Public License and the
-dnl  GNU Lesser General Public License along with the GNU MP Library.  If not,
-dnl  see https://www.gnu.org/licenses/.
-
-include(`../config.m4')
-
-C            cycles/limb
-C z900		 -
-C z990		 -
-C z9		 -
-C z10		 -
-C z196		 -
-C z12		 ?
-C z13		 ?
-C z14		 ?
-C z15		 ?
-
-define(`ap',	`%r2')
-define(`n',	`%r3')
-
-ASM_START()
-PROLOGUE(mpn_popcount)
-	vzero	%v30
-	tmll	n, 1
-	srlg	n, n, 1
-	je	L(top)
-
-L(odd):	vllezg	%v16, 0(ap)
-	vpopct	%v30, %v16, 3
-	la	ap, 8(ap)
-	clgije	n, 0, L(end)
-
-L(top):	vl	%v16, 0(ap), 3
-	vpopct	%v20, %v16, 3
-	vag	%v30, %v30, %v20
-	la	ap, 16(ap)
-	brctg	n, L(top)
-
-L(end):	vzero	%v29
-	vsumqg	%v30, %v30, %v29
-	vlgvg	%r2, %v30, 1(%r0)
-	br	%r14
-EPILOGUE()
diff -r b84cfb2ca5df -r 372acfd0c33e mpn/s390_64/z14/hamdist.asm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpn/s390_64/z14/hamdist.asm	Thu Aug 03 16:18:17 2023 +0200
@@ -0,0 +1,76 @@
+dnl  S/390-64 mpn_hamdist
+
+dnl  Copyright 2023 Free Software Foundation, Inc.
+
+dnl  This file is part of the GNU MP Library.
+dnl
+dnl  The GNU MP Library is free software; you can redistribute it and/or modify
+dnl  it under the terms of either:
+dnl
+dnl    * the GNU Lesser General Public License as published by the Free
+dnl      Software Foundation; either version 3 of the License, or (at your
+dnl      option) any later version.
+dnl
+dnl  or
+dnl
+dnl    * the GNU General Public License as published by the Free Software
+dnl      Foundation; either version 2 of the License, or (at your option) any
+dnl      later version.
+dnl
+dnl  or both in parallel, as here.
+dnl
+dnl  The GNU MP Library is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+dnl  for more details.
+dnl
+dnl  You should have received copies of the GNU General Public License and the
+dnl  GNU Lesser General Public License along with the GNU MP Library.  If not,
+dnl  see https://www.gnu.org/licenses/.
+
+include(`../config.m4')
+
+C            cycles/limb
+C z900		 -
+C z990		 -
+C z9		 -
+C z10		 -
+C z196		 -
+C z12		 ?
+C z13		 ?
+C z14		 ?
+C z15		 ?
+
+define(`ap',	`%r2')
+define(`bp',	`%r3')
+define(`n',	`%r4')
+
+ASM_START()
+PROLOGUE(mpn_hamdist)
+	vzero	%v30
+	tmll	n, 1
+	srlg	n, n, 1
+	je	L(top)
+
+L(odd):	vllezg	%v16, 0(ap)
+	vllezg	%v17, 0(bp)
+	vx	%v16, %v16, %v17
+	vpopctg	%v30, %v16
+	la	ap, 8(ap)
+	la	bp, 8(bp)
+	clgije	n, 0, L(end)
+
+L(top):	vl	%v16, 0(ap), 3
+	vl	%v17, 0(bp), 3
+	vx	%v16, %v16, %v17
+	vpopctg	%v20, %v16
+	vag	%v30, %v30, %v20
+	la	ap, 16(ap)
+	la	bp, 16(bp)
+	brctg	n, L(top)
+
+L(end):	vzero	%v29
+	vsumqg	%v30, %v30, %v29
+	vlgvg	%r2, %v30, 1(%r0)
+	br	%r14
+EPILOGUE()
diff -r b84cfb2ca5df -r 372acfd0c33e mpn/s390_64/z14/popcount.asm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpn/s390_64/z14/popcount.asm	Thu Aug 03 16:18:17 2023 +0200
@@ -0,0 +1,69 @@
+dnl  S/390-64 mpn_popcount
+
+dnl  Copyright 2023 Free Software Foundation, Inc.
+
+dnl  This file is part of the GNU MP Library.
+dnl
+dnl  The GNU MP Library is free software; you can redistribute it and/or modify
+dnl  it under the terms of either:
+dnl
+dnl    * the GNU Lesser General Public License as published by the Free
+dnl      Software Foundation; either version 3 of the License, or (at your
+dnl      option) any later version.
+dnl
+dnl  or
+dnl
+dnl    * the GNU General Public License as published by the Free Software
+dnl      Foundation; either version 2 of the License, or (at your option) any
+dnl      later version.
+dnl
+dnl  or both in parallel, as here.
+dnl
+dnl  The GNU MP Library is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+dnl  for more details.
+dnl
+dnl  You should have received copies of the GNU General Public License and the
+dnl  GNU Lesser General Public License along with the GNU MP Library.  If not,
+dnl  see https://www.gnu.org/licenses/.
+
+include(`../config.m4')
+
+C            cycles/limb
+C z900		 -
+C z990		 -
+C z9		 -
+C z10		 -
+C z196		 -
+C z12		 ?
+C z13		 ?
+C z14		 ?
+C z15		 ?
+
+define(`ap',	`%r2')
+define(`n',	`%r3')
+
+ASM_START()
+PROLOGUE(mpn_popcount)
+	vzero	%v30
+	tmll	n, 1
+	srlg	n, n, 1
+	je	L(top)
+
+L(odd):	vllezg	%v16, 0(ap)
+	vpopctg	%v30, %v16
+	la	ap, 8(ap)
+	clgije	n, 0, L(end)
+
+L(top):	vl	%v16, 0(ap), 3
+	vpopctg	%v20, %v16
+	vag	%v30, %v30, %v20
+	la	ap, 16(ap)
+	brctg	n, L(top)


More information about the gmp-commit mailing list