Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/lib: Use exrl instead of ex in xor functions

exrl is present in all machines currently supported, therefore prefer
it over ex. This saves one instruction and doesn't need an additional
register to hold the address of the target instruction.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

authored by

Sven Schnelle and committed by
Alexander Gordeev
745600ed 9988df07

+29 -32
+29 -32
arch/s390/lib/xor.c
··· 15 15 const unsigned long * __restrict p2) 16 16 { 17 17 asm volatile( 18 - " larl 1,2f\n" 19 18 " aghi %0,-1\n" 20 19 " jm 3f\n" 21 20 " srlg 0,%0,8\n" ··· 24 25 " la %1,256(%1)\n" 25 26 " la %2,256(%2)\n" 26 27 " brctg 0,0b\n" 27 - "1: ex %0,0(1)\n" 28 + "1: exrl %0,2f\n" 28 29 " j 3f\n" 29 30 "2: xc 0(1,%1),0(%2)\n" 30 31 "3:\n" 31 32 : : "d" (bytes), "a" (p1), "a" (p2) 32 - : "0", "1", "cc", "memory"); 33 + : "0", "cc", "memory"); 33 34 } 34 35 35 36 static void xor_xc_3(unsigned long bytes, unsigned long * __restrict p1, ··· 37 38 const unsigned long * __restrict p3) 38 39 { 39 40 asm volatile( 40 - " larl 1,2f\n" 41 41 " aghi %0,-1\n" 42 - " jm 3f\n" 42 + " jm 4f\n" 43 43 " srlg 0,%0,8\n" 44 44 " ltgr 0,0\n" 45 45 " jz 1f\n" ··· 48 50 " la %2,256(%2)\n" 49 51 " la %3,256(%3)\n" 50 52 " brctg 0,0b\n" 51 - "1: ex %0,0(1)\n" 52 - " ex %0,6(1)\n" 53 - " j 3f\n" 53 + "1: exrl %0,2f\n" 54 + " exrl %0,3f\n" 55 + " j 4f\n" 54 56 "2: xc 0(1,%1),0(%2)\n" 55 - " xc 0(1,%1),0(%3)\n" 56 - "3:\n" 57 + "3: xc 0(1,%1),0(%3)\n" 58 + "4:\n" 57 59 : "+d" (bytes), "+a" (p1), "+a" (p2), "+a" (p3) 58 - : : "0", "1", "cc", "memory"); 60 + : : "0", "cc", "memory"); 59 61 } 60 62 61 63 static void xor_xc_4(unsigned long bytes, unsigned long * __restrict p1, ··· 64 66 const unsigned long * __restrict p4) 65 67 { 66 68 asm volatile( 67 - " larl 1,2f\n" 68 69 " aghi %0,-1\n" 69 - " jm 3f\n" 70 + " jm 5f\n" 70 71 " srlg 0,%0,8\n" 71 72 " ltgr 0,0\n" 72 73 " jz 1f\n" ··· 77 80 " la %3,256(%3)\n" 78 81 " la %4,256(%4)\n" 79 82 " brctg 0,0b\n" 80 - "1: ex %0,0(1)\n" 81 - " ex %0,6(1)\n" 82 - " ex %0,12(1)\n" 83 - " j 3f\n" 83 + "1: exrl %0,2f\n" 84 + " exrl %0,3f\n" 85 + " exrl %0,4f\n" 86 + " j 5f\n" 84 87 "2: xc 0(1,%1),0(%2)\n" 85 - " xc 0(1,%1),0(%3)\n" 86 - " xc 0(1,%1),0(%4)\n" 87 - "3:\n" 88 + "3: xc 0(1,%1),0(%3)\n" 89 + "4: xc 0(1,%1),0(%4)\n" 90 + "5:\n" 88 91 : "+d" (bytes), "+a" (p1), "+a" (p2), "+a" (p3), "+a" (p4) 89 - : : "0", "1", "cc", "memory"); 92 + : : "0", "cc", "memory"); 90 93 } 91 94 92 95 static void xor_xc_5(unsigned long bytes, unsigned long * __restrict p1, ··· 98 101 asm volatile( 99 102 " larl 1,2f\n" 100 103 " aghi %0,-1\n" 101 - " jm 3f\n" 104 + " jm 6f\n" 102 105 " srlg 0,%0,8\n" 103 106 " ltgr 0,0\n" 104 107 " jz 1f\n" ··· 112 115 " la %4,256(%4)\n" 113 116 " la %5,256(%5)\n" 114 117 " brctg 0,0b\n" 115 - "1: ex %0,0(1)\n" 116 - " ex %0,6(1)\n" 117 - " ex %0,12(1)\n" 118 - " ex %0,18(1)\n" 119 - " j 3f\n" 118 + "1: exrl %0,2f\n" 119 + " exrl %0,3f\n" 120 + " exrl %0,4f\n" 121 + " exrl %0,5f\n" 122 + " j 6f\n" 120 123 "2: xc 0(1,%1),0(%2)\n" 121 - " xc 0(1,%1),0(%3)\n" 122 - " xc 0(1,%1),0(%4)\n" 123 - " xc 0(1,%1),0(%5)\n" 124 - "3:\n" 124 + "3: xc 0(1,%1),0(%3)\n" 125 + "4: xc 0(1,%1),0(%4)\n" 126 + "5: xc 0(1,%1),0(%5)\n" 127 + "6:\n" 125 128 : "+d" (bytes), "+a" (p1), "+a" (p2), "+a" (p3), "+a" (p4), 126 129 "+a" (p5) 127 - : : "0", "1", "cc", "memory"); 130 + : : "0", "cc", "memory"); 128 131 } 129 132 130 133 struct xor_block_template xor_block_xc = {