Re: [PATCH -v4] crypto: Add PCLMULQDQ accelerated GHASH implementation

[Huang Ying <ying.huang@intel.com>]

On Mon, 2009-11-02 at 22:32 +0800, Ingo Molnar wrote: 
> * Herbert Xu <herbert@gondor.apana.org.au> wrote:
> 
> > On Mon, Nov 02, 2009 at 08:50:39AM +0100, Ingo Molnar wrote:
> > > 
> > > A cleanup request: mind creating two macros for this PSHUFB MMX/SSE 
> > > instruction in arch/x86/include/asm/i387.h, instead of open-coding the 
> > > .byte sequences in ~6 places?
> > 
> > I had a go at doing that, but it seems that i387.h isn't really meant 
> > to be included in an asm file at this point :)
> 
> Please use the standard construct and put an #ifndef __ASSEMBLY__ around 
> it.
> 
> > > ( After the .33 merge window we'll collect such instruction format 
> > >   knowledge in arch/x86/include/asm/inst.h. That file is not upstream 
> > >   yet so i387.h will do for now for FPU/SSE instructions. )
> > 
> > I'm happy to revisit this once inst.h exists.
> 
> No reason to not do most of the change first though, the way i suggested 
> it.

How about something as below? But it seems not appropriate to put these
bits into i387.h, that is, to combine C and gas syntax.

Best Regards,
Huang Ying

.macro xmm_num opd xmm
.ifc \xmm,%xmm0
\opd = 0
.endif
.ifc \xmm,%xmm1
\opd = 1
.endif
.ifc \xmm,%xmm2
\opd = 2
.endif
.ifc \xmm,%xmm3
\opd = 3
.endif
.ifc \xmm,%xmm4
\opd = 4
.endif
.ifc \xmm,%xmm5
\opd = 5
.endif
.ifc \xmm,%xmm6
\opd = 6
.endif
.ifc \xmm,%xmm7
\opd = 7
.endif
.ifc \xmm,%xmm8
\opd = 8
.endif
.ifc \xmm,%xmm9
\opd = 9
.endif
.ifc \xmm,%xmm10
\opd = 10
.endif
.ifc \xmm,%xmm11
\opd = 11
.endif
.ifc \xmm,%xmm12
\opd = 12
.endif
.ifc \xmm,%xmm13
\opd = 13
.endif
.ifc \xmm,%xmm14
\opd = 14
.endif
.ifc \xmm,%xmm15
\opd = 15
.endif
.endm

.macro PSHUFB_XMM xmm1 xmm2
xmm_num pshufb_opd1 \xmm1
xmm_num pshufb_opd2 \xmm2
.if (pshufb_opd1 < 8) && (pshufb_opd2 < 8)
.byte 0x66, 0x0f, 0x38, 0x00, 0xc0 | pshufb_opd1 | (pshufb_opd2<<3)
.elseif (pshufb_opd1 >= 8) && (pshufb_opd2 < 8)
.byte 0x66, 0x41, 0x0f, 0x38, 0x00, 0xc0 | (pshufb_opd1-8) | (pshufb_opd2<<3)
.elseif (pshufb_opd1 < 8) && (pshufb_opd2 >= 8)
.byte 0x66, 0x44, 0x0f, 0x38, 0x00, 0xc0 | pshufb_opd1 | ((pshufb_opd2-8)<<3)
.else
.byte 0x66, 0x45, 0x0f, 0x38, 0x00, 0xc0 | (pshufb_opd1-8) | ((pshufb_opd2-8)<<3)
.endif
.endm