powerpc: sysdev: cpm1: Optimise gpio bit calculation
PATCH 1/1 powerpc: sysdev: cpm1: Optimise gpio bit calculation
Help a bit the compiler to provide better code:
unsigned int f(int i)
{
return 1 << (31 - i);
}unsigned int g(int i)
{
return 0x80000000 >> i;
}Disassembly of section .text:
00000000 <f>:
0: 20 63 00 1f subfic r3,r3,31 4: 39 20 00 01 li r9,1 8: 7d 23 18 30 slw r3,r9,r3
c: 4e 80 00 20 blr
00000010 <g>:
10: 3d 20 80 00 lis r9,-32768
14: 7d 23 1c 30 srw r3,r9,r3
18: 4e 80 00 20 blr
--- arch/powerpc/sysdev/cpm1.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
arch/powerpc/sysdev/cpm1.c +10 -14
@@ -307,7 +307,7 @@ struct cpm_ioport32e {static void cpm1_set_pin32 (int port,int pin,int flags) {struct cpm_ioport32e __iomem *iop; - pin =1 << (31 - pin); + pin =0x80000000 >> pin;if (port ==CPM_PORTB ) iop = (struct cpm_ioport32e __iomem *)
@@ -351,7 +351,7 @@ static void cpm1_set_pin16(int port, int pin, int flags)struct cpm_ioport16 __iomem *iop = (struct cpm_ioport16 __iomem *)&mpc8xx_immr->im_ioport; - pin =1 << (15 - pin); + pin =0x8000 >> pin;if (port !=0 ) iop += port -1 ;
@@ -550,9 +550,7 @@ static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio) {struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc);struct cpm_ioport16 __iomem *iop = mm_gc->regs; -u16 pin_mask; - - pin_mask =1 << (15 - gpio); +u16 pin_mask = pin_mask =0x8000 >> gpio;return !!(in_be16 (&iop->dat) & pin_mask); }
@@ -576,7 +574,7 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc);struct cpm1_gpio16_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);unsigned long flags; -u16 pin_mask =1 << (15 - gpio); +u16 pin_mask =0x8000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
@@ -599,7 +597,7 @@ static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)struct cpm1_gpio16_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);struct cpm_ioport16 __iomem *iop = mm_gc->regs;unsigned long flags; -u16 pin_mask =1 << (15 - gpio); +u16 pin_mask =0x8000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
@@ -617,7 +615,7 @@ static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)struct cpm1_gpio16_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);struct cpm_ioport16 __iomem *iop = mm_gc->regs;unsigned long flags; -u16 pin_mask =1 << (15 - gpio); +u16 pin_mask =0x8000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
@@ -684,9 +682,7 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio) {struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc);struct cpm_ioport32b __iomem *iop = mm_gc->regs; -u32 pin_mask; - - pin_mask =1 << (31 - gpio); +u32 pin_mask =0x80000000 >> gpio;return !!(in_be32 (&iop->dat) & pin_mask); }
@@ -710,7 +706,7 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc);struct cpm1_gpio32_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);unsigned long flags; -u32 pin_mask =1 << (31 - gpio); +u32 pin_mask =0x80000000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
@@ -725,7 +721,7 @@ static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)struct cpm1_gpio32_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);struct cpm_ioport32b __iomem *iop = mm_gc->regs;unsigned long flags; -u32 pin_mask =1 << (31 - gpio); +u32 pin_mask =0x80000000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
@@ -743,7 +739,7 @@ static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)struct cpm1_gpio32_chip *cpm1_gc =gpiochip_get_data (&mm_gc->gc);struct cpm_ioport32b __iomem *iop = mm_gc->regs;unsigned long flags; -u32 pin_mask =1 << (31 - gpio); +u32 pin_mask =0x80000000 >> gpio;spin_lock_irqsave (&cpm1_gc->lock, flags);
Signature · 1 line
2.12.0
Michael Ellerman
reviewerQuoted 18 lines · Christophe Leroy
Help a bit the compiler to provide better code:
unsigned int f(int i)
{ return 1 << (31 - i); }unsigned int g(int i)
{ return 0x80000000 >> i; }Disassembly of section .text:
00000000 <f>:
0: 20 63 00 1f subfic r3,r3,31 4: 39 20 00 01 li r9,1 8: 7d 23 18 30 slw r3,r9,r3
Quoted 6 lines
c: 4e 80 00 20 blr
00000010 <g>:
10: 3d 20 80 00 lis r9,-32768
14: 7d 23 1c 30 srw r3,r9,r3
18: 4e 80 00 20 blr
Well yeah, it saves one instruction, but is it worth it? Are these gpio routines in some hot path I don't know about?
cheers
Quoted 22 lines · Michael Ellerman
Quoted 20 lines · Christophe Leroy
Help a bit the compiler to provide better code:
unsigned int f(int i)
{ return 1 << (31 - i); }unsigned int g(int i)
{ return 0x80000000 >> i; }Disassembly of section .text:
00000000 <f>:
0: 20 63 00 1f subfic r3,r3,31 4: 39 20 00 01 li r9,1 8: 7d 23 18 30 slw r3,r9,r3c: 4e 80 00 20 blr
Quoted 8 lines
Quoted 4 lines
00000010 <g>:
10: 3d 20 80 00 lis r9,-32768
14: 7d 23 1c 30 srw r3,r9,r3
18: 4e 80 00 20 blrWell yeah, it saves one instruction, but is it worth it? Are these gpio routines in some hot path I don't know about?
It saves one instruction, and one register (see other exemple below where r3 is to be preserved)
gpio_get() and gpio_set() are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of 0x80000000 >> i )
unsigned int f(int i, unsigned int *a)
{
*a = 1 << (31 - i);
return i;
}unsigned int g(int i, unsigned int *a)
{
*a = 0x80000000 >> i;
return i;
}toto.o: file format elf32-powerpc
Disassembly of section .text:
00000000 <f>:
0: 21 43 00 1f subfic r10,r3,31 4: 39 20 00 01 li r9,1 8: 7d 29 50 30 slw r9,r9,r10 c: 91 24 00 00 stw r9,0(r4)
10: 4e 80 00 20 blr
00000014 <g>:
14: 3d 20 80 00 lis r9,-32768 18: 7d 29 1c 30 srw r9,r9,r3 1c: 91 24 00 00 stw r9,0(r4)
20: 4e 80 00 20 blr
Quoted 4 lines · Christophe LEROY
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )
1 << 31 is undefined behaviour, of course.
Segher
Quoted 8 lines · Segher Boessenkool
Quoted 4 lines · Christophe LEROY
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )1 << 31 is undefined behaviour, of course.
Shall it be 1U << 31 ?
Christophe
Quoted 11 lines · Christophe LEROY
Quoted 8 lines · Segher Boessenkool
Quoted 4 lines · Christophe LEROY
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )1 << 31 is undefined behaviour, of course.
Shall it be 1U << 31 ?
Sure, that works. "1 << (31 - i)" is most readable (but it doesn't yet generate the code you want).
Segher
Quoted 8 lines · Segher Boessenkool
Quoted 7 lines · Christophe LEROY
Quoted 6 lines · Segher Boessenkool
Quoted 4 lines · Christophe LEROY
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
1 << 31 is undefined behaviour, of course.
Shall it be 1U << 31 ?
Sure, that works. "1 << (31 - i)" is most readable (but it doesn't yet generate the code you want).
Euh .... I'm a bit lost. Do you mean the form we have today is the driver is wrong ?
@@ -684,9 +682,7 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)
{
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm_ioport32b __iomem *iop = mm_gc->regs;
- u32 pin_mask;
-
- pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = 0x80000000 >> gpio;
return !!(in_be32(&iop->dat) & pin_mask);
}
Which I thought could also become
@@ -684,9 +682,7 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)
{
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm_ioport32b __iomem *iop = mm_gc->regs;
- u32 pin_mask;
-
- pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = (1 << 31) >> gpio;
return !!(in_be32(&iop->dat) & pin_mask);
}
Christophe
Quoted 7 lines · Christophe LEROY
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )1 << 31 is undefined behaviour, of course.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Shall it be 1U << 31 ?
Sure, that works. "1 << (31 - i)" is most readable (but it doesn't yet generate the code you want).
Euh .... I'm a bit lost. Do you mean the form we have today is the driver is wrong ?
Heh, yes. But is't okay with GCC, so don't worry about it.
The point is that "0x80000000 >> i" is less readable.
Segher
Quoted 6 lines · Segher Boessenkool
Quoted 5 lines · Christophe LEROY
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
gpio_get()andgpio_set()are used extensively by some GPIO based drivers like SPI, NAND, so it may be worth it as it doesn't impair readability (if anyone prefers, we could write (1 << 31) >> i instead of0x80000000>> i )1 << 31 is undefined behaviour, of course.
Quoted 10 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Shall it be 1U << 31 ?
Sure, that works. "1 << (31 - i)" is most readable (but it doesn't yet generate the code you want).
Euh .... I'm a bit lost. Do you mean the form we have today is the driver is wrong ?
Heh, yes. But is't okay with GCC, so don't worry about it.
The point is that "
0x80000000>> i" is less readable.
FYI, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80131
Christophe
Quoted 2 lines · Michael Ellerman
Well yeah, it saves one instruction, but is it worth it? Are these gpio routines in some hot path I don't know about?
If there was a GCC PR for this we probably would make GCC optimise this; there are many similar things that are optimised already, just not this one.
Segher