mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-09 13:30:03 -05:00
d824b461ae
As Maarten Baert recently reported, the current dmix code applies the
semaphore unnecessarily around mixing streams even when the lockless
mix operation is used on x86. This was rather introduced mistakenly
at the commit 267d7c7281 ("Add support of little-endian on
i386/x86_64 dmix") where the generic dmix code was included on x86,
too.
For achieving the original performance back, this patch changes the
semaphore handling to be checked at run time instead of statically at
compile time.
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
106 lines
2.5 KiB
C
106 lines
2.5 KiB
C
/*
|
|
* optimized mixing code for x86-64
|
|
*/
|
|
|
|
#define MIX_AREAS_16 mix_areas_16
|
|
#define MIX_AREAS_32 mix_areas_32
|
|
#define MIX_AREAS_24 mix_areas_24
|
|
#define LOCK_PREFIX ""
|
|
#define XADD "addl"
|
|
#define XSUB "subl"
|
|
#include "pcm_dmix_x86_64.h"
|
|
#undef MIX_AREAS_16
|
|
#undef MIX_AREAS_32
|
|
#undef MIX_AREAS_24
|
|
#undef LOCK_PREFIX
|
|
#undef XADD
|
|
#undef XSUB
|
|
|
|
#define MIX_AREAS_16 remix_areas_16
|
|
#define MIX_AREAS_32 remix_areas_32
|
|
#define MIX_AREAS_24 remix_areas_24
|
|
#define LOCK_PREFIX ""
|
|
#define XADD "subl"
|
|
#define XSUB "addl"
|
|
#include "pcm_dmix_x86_64.h"
|
|
#undef MIX_AREAS_16
|
|
#undef MIX_AREAS_32
|
|
#undef MIX_AREAS_24
|
|
#undef LOCK_PREFIX
|
|
#undef XADD
|
|
#undef XSUB
|
|
|
|
#define MIX_AREAS_16 mix_areas_16_smp
|
|
#define MIX_AREAS_32 mix_areas_32_smp
|
|
#define MIX_AREAS_24 mix_areas_24_smp
|
|
#define LOCK_PREFIX "lock ; "
|
|
#define XADD "addl"
|
|
#define XSUB "subl"
|
|
#include "pcm_dmix_x86_64.h"
|
|
#undef MIX_AREAS_16
|
|
#undef MIX_AREAS_32
|
|
#undef MIX_AREAS_24
|
|
#undef LOCK_PREFIX
|
|
#undef XADD
|
|
#undef XSUB
|
|
|
|
#define MIX_AREAS_16 remix_areas_16_smp
|
|
#define MIX_AREAS_32 remix_areas_32_smp
|
|
#define MIX_AREAS_24 remix_areas_24_smp
|
|
#define LOCK_PREFIX "lock ; "
|
|
#define XADD "subl"
|
|
#define XSUB "addl"
|
|
#include "pcm_dmix_x86_64.h"
|
|
#undef MIX_AREAS_16
|
|
#undef MIX_AREAS_32
|
|
#undef MIX_AREAS_24
|
|
#undef LOCK_PREFIX
|
|
#undef XADD
|
|
#undef XSUB
|
|
|
|
#define x86_64_dmix_supported_format \
|
|
((1ULL << SND_PCM_FORMAT_S16_LE) |\
|
|
(1ULL << SND_PCM_FORMAT_S32_LE) |\
|
|
(1ULL << SND_PCM_FORMAT_S24_3LE))
|
|
|
|
#define dmix_supported_format \
|
|
(x86_64_dmix_supported_format | generic_dmix_supported_format)
|
|
|
|
static void mix_select_callbacks(snd_pcm_direct_t *dmix)
|
|
{
|
|
static int smp = 0;
|
|
|
|
if (!dmix->direct_memory_access) {
|
|
generic_mix_select_callbacks(dmix);
|
|
return;
|
|
}
|
|
|
|
if (!((1ULL<< dmix->shmptr->s.format) & x86_64_dmix_supported_format)) {
|
|
generic_mix_select_callbacks(dmix);
|
|
return;
|
|
}
|
|
|
|
if (!smp) {
|
|
FILE *in;
|
|
char line[255];
|
|
|
|
/* try to determine, if we have SMP */
|
|
in = fopen("/proc/cpuinfo", "r");
|
|
if (in) {
|
|
while (!feof(in)) {
|
|
fgets(line, sizeof(line), in);
|
|
if (!strncmp(line, "processor", 9))
|
|
smp++;
|
|
}
|
|
fclose(in);
|
|
}
|
|
}
|
|
// printf("SMP: %i\n", smp);
|
|
dmix->u.dmix.mix_areas_16 = smp > 1 ? mix_areas_16_smp : mix_areas_16;
|
|
dmix->u.dmix.remix_areas_16 = smp > 1 ? remix_areas_16_smp : remix_areas_16;
|
|
dmix->u.dmix.mix_areas_32 = smp > 1 ? mix_areas_32_smp : mix_areas_32;
|
|
dmix->u.dmix.remix_areas_32 = smp > 1 ? remix_areas_32_smp : remix_areas_32;
|
|
dmix->u.dmix.mix_areas_24 = smp > 1 ? mix_areas_24_smp : mix_areas_24;
|
|
dmix->u.dmix.remix_areas_24 = smp > 1 ? remix_areas_24_smp : remix_areas_24;
|
|
dmix->u.dmix.use_sem = 0;
|
|
}
|