generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparcv9cap.c: reiterate CPU detection logic.

Browse Source
This commit is contained in:
Andy Polyakov 2010-07-08 07:47:35 +00:00
parent dc53a037b0
commit 7c5889bf7a
2 changed files with 70 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
crypto/sparccpuid.S
View File

@ -232,13 +232,59 @@ _sparcv9_rdtick:
.type _sparcv9_rdtick,#function .type _sparcv9_rdtick,#function
.size _sparcv9_rdtick,.-_sparcv9_rdtick .size _sparcv9_rdtick,.-_sparcv9_rdtick
! Probe and instrument VIS1 instruction. Output is number of cycles it
! takes to execute rdtick and pair of VIS1 instructions. US-Tx VIS unit
! is slow (documented to be 6 cycles on T2) and the core is in-order
! single-issue, it should be possible to distinguish Tx reliably...
! Observed return values are:
!
! UltraSPARC IIi 7
! UltraSPARC III 7
! UltraSPARC T1 24
!
! Numbers for T2 and SPARC64 V-VII are more than welcomed.
!
! It would be possible to detect specifically US-T1 by instrumenting
! fmul8ulx16, which is emulated on T1 and as such accounts for quite
! a lot of %tick-s, couple of thousand on Linux...
.global _sparcv9_vis1_probe .global _sparcv9_vis1_probe
.align 8 .align 8
_sparcv9_vis1_probe: _sparcv9_vis1_probe:
.word 0x81b00c20 !fzeros %f0 .word 0x91410000 !rd %tick,%o0
add %sp,BIAS+2,%o0 .word 0x81b00d80 !fxor %f0,%f0,%f0
.word 0x85b08d82 !fxor %f2,%f2,%f2
.word 0x93410000 !rd %tick,%o1
.word 0x81b00d80 !fxor %f0,%f0,%f0
.word 0x85b08d82 !fxor %f2,%f2,%f2
.word 0x95410000 !rd %tick,%o2
.word 0x81b00d80 !fxor %f0,%f0,%f0
.word 0x85b08d82 !fxor %f2,%f2,%f2
.word 0x97410000 !rd %tick,%o3
.word 0x81b00d80 !fxor %f0,%f0,%f0
.word 0x85b08d82 !fxor %f2,%f2,%f2
.word 0x99410000 !rd %tick,%o4
! calculate intervals
sub %o1,%o0,%o0
sub %o2,%o1,%o1
sub %o3,%o2,%o2
sub %o4,%o3,%o3
! find minumum value
cmp %o0,%o1
.word 0x38680002 !bgu,a %xcc,.+8
mov %o1,%o0
cmp %o0,%o2
.word 0x38680002 !bgu,a %xcc,.+8
mov %o2,%o0
cmp %o0,%o3
.word 0x38680002 !bgu,a %xcc,.+8
mov %o3,%o0
! check for ASI_FP16_P is redundant...
add %sp,BIAS+2,%o1
retl retl
.word 0xc19a1a40 !ldda [%o0]ASI_FP16_P,%f0 .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0
.type _sparcv9_vis1_probe,#function .type _sparcv9_vis1_probe,#function
.size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe .size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe

40
crypto/sparcv9cap.c
View File

@ -27,7 +27,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
} }
unsigned long _sparcv9_rdtick(void); unsigned long _sparcv9_rdtick(void);
void _sparcv9_vis1_probe(void); unsigned long _sparcv9_vis1_probe(void);
unsigned long OPENSSL_rdtsc(void) unsigned long OPENSSL_rdtsc(void)
{ {
@ -175,16 +175,30 @@ void OPENSSL_cpuid_setup(void)
common_act.sa_handler = common_handler; common_act.sa_handler = common_handler;
common_act.sa_mask = all_masked; common_act.sa_mask = all_masked;
sigaction(SIGILL,&common_act,&ill_oact);
if (sigsetjmp(common_jmp,0) == 0)
{
_sparcv9_rdtick();
OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
}
else
{
/* This happens on US-I&II, which have working VIS1
* and fast FPU... In other words we are done... */
OPENSSL_sparcv9cap_P |= SPARCV9_TICK_PRIVILEGED;
sigaction(SIGILL,&ill_oact,NULL);
sigprocmask(SIG_SETMASK,&oset,NULL);
return;
}
sigaction(SIGILL,&ill_oact,NULL);
sigaction(SIGILL,&common_act,&ill_oact); sigaction(SIGILL,&common_act,&ill_oact);
sigaction(SIGBUS,&common_act,&bus_oact);/* T1 fails 16-bit ldda */ sigaction(SIGBUS,&common_act,&bus_oact);/* T1 fails 16-bit ldda */
if ((sig=sigsetjmp(common_jmp,0)) == 0) if ((sig=sigsetjmp(common_jmp,0)) == 0)
{ {
_sparcv9_vis1_probe(); /* see sparccpud.S for details... */
OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; if (_sparcv9_vis1_probe() >= 12)
} OPENSSL_sparcv9cap_P &= ~SPARCV9_VIS1;
else if (sig == SIGBUS) /* T1 fails 16-bit ldda */
{
OPENSSL_sparcv9cap_P &= ~SPARCV9_PREFER_FPU;
} }
else else
{ {
@ -193,18 +207,6 @@ void OPENSSL_cpuid_setup(void)
sigaction(SIGBUS,&bus_oact,NULL); sigaction(SIGBUS,&bus_oact,NULL);
sigaction(SIGILL,&ill_oact,NULL); sigaction(SIGILL,&ill_oact,NULL);
sigaction(SIGILL,&common_act,&ill_oact);
if (sigsetjmp(common_jmp,0) == 0)
{
_sparcv9_rdtick();
OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
}
else
{
OPENSSL_sparcv9cap_P |= SPARCV9_TICK_PRIVILEGED;
}
sigaction(SIGILL,&ill_oact,NULL);
sigprocmask(SIG_SETMASK,&oset,NULL); sigprocmask(SIG_SETMASK,&oset,NULL);
} }