system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-14 20:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: Use XSAVEOPT for fpusave(), when available

Browse source 
Remove redundant npxsave_core definition while here.

Suggested by:	Anton Rang
Reviewed by:	kib, Anton Rang <rang AT acm.org>
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D19665
This commit is contained in:
Conrad Meyer 2019-03-26 22:45:41 +00:00
parent 7762bbc30e
commit 8207def158
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=345562
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/amd64/amd64/fpu.c
View file

@ -100,6 +100,17 @@ xsave(char *addr, uint64_t mask)
"memory");
}
static __inline void
xsaveopt(char *addr, uint64_t mask)
{
uint32_t low, hi;
low = mask;
hi = mask >> 32;
__asm __volatile("xsaveopt %0" : "=m" (*addr) : "a" (low), "d" (hi) :
"memory");
}
#else /* !(__GNUCLIKE_ASM && !lint) */
void fldcw(u_short cw);
@ -113,6 +124,7 @@ void ldmxcsr(u_int csr);
void stmxcsr(u_int *csr);
void xrstor(char *addr, uint64_t mask);
void xsave(char *addr, uint64_t mask);
void xsaveopt(char *addr, uint64_t mask);
#endif /* __GNUCLIKE_ASM && !lint */
@ -157,6 +169,13 @@ struct xsave_area_elm_descr {
u_int size;
} *xsave_area_desc;
static void
fpusave_xsaveopt(void *addr)
{
xsaveopt((char *)addr, xsave_mask);
}
static void
fpusave_xsave(void *addr)
{
@ -201,7 +220,10 @@ DEFINE_IFUNC(, void, fpusave, (void *), static)
{
init_xsave();
return (use_xsave ? fpusave_xsave : fpusave_fxsave);
if (use_xsave)
return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ?
fpusave_xsaveopt : fpusave_xsave);
return (fpusave_fxsave);
}
DEFINE_IFUNC(, void, fpurestore, (void *), static)
@ -356,7 +378,7 @@ fpuinitstate(void *arg __unused)
saveintr = intr_disable();
stop_emulating();
fpusave(fpu_initialstate);
fpusave_fxsave(fpu_initialstate);
if (fpu_initialstate->sv_env.en_mxcsr_mask)
cpu_mxcsr_mask = fpu_initialstate->sv_env.en_mxcsr_mask;
else

24
sys/i386/i386/npx.c
View file

@ -313,7 +313,7 @@ npx_probe(void)
}
static void
npxsave_xsaveopt(union savefpu *addr)
fpusave_xsaveopt(union savefpu *addr)
{
xsaveopt((char *)addr, xsave_mask);
@ -352,24 +352,13 @@ init_xsave(void)
TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave);
}
DEFINE_IFUNC(, void, npxsave_core, (union savefpu *), static)
{
init_xsave();
if (use_xsave)
return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ?
npxsave_xsaveopt : fpusave_xsave);
if (cpu_fxsr)
return (fpusave_fxsave);
return (fpusave_fnsave);
}
DEFINE_IFUNC(, void, fpusave, (union savefpu *), static)
{
init_xsave();
if (use_xsave)
return (fpusave_xsave);
return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ?
fpusave_xsaveopt : fpusave_xsave);
if (cpu_fxsr)
return (fpusave_fxsave);
return (fpusave_fnsave);
@ -494,7 +483,10 @@ npxinitstate(void *arg __unused)
saveintr = intr_disable();
stop_emulating();
fpusave(npx_initialstate);
if (cpu_fxsr)
fpusave_fxsave(npx_initialstate);
else
fpusave_fnsave(npx_initialstate);
if (cpu_fxsr) {
if (npx_initialstate->sv_xmm.sv_env.en_mxcsr_mask)
cpu_mxcsr_mask =
@ -922,7 +914,7 @@ npxsave(union savefpu *addr)
{
stop_emulating();
npxsave_core(addr);
fpusave(addr);
}
void npxswitch(struct thread *td, struct pcb *pcb);