Skip to content

F
ffmpeg.wasm-core
Commit e45a2872 authored by Romain Dolbeau's avatar Romain Dolbeau Committed by Michael Niedermayer
Browse files
Options

1) remove TBL support in PPC performance. It's much more useful to use the 

    PMCs, and with Apple's CHUD it's fairly easy too. No reason to keep useless
    code around
2) make the PPC perf stuff a configure option
3) make put_pixels16_altivec a bit faster by unrolling the loop by 4
patch by (Romain Dolbeau <dolbeau at irisa dot fr>)

Originally committed as revision 2022 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0273ceeb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 220 deletions
configure
View file @ e45a2872
...@@ -27,6 +27,7 @@ make="make" ...@@ -27,6 +27,7 @@ make="make"
strip="strip" strip="strip"
cpu=`uname -m` cpu=`uname -m`
tune="generic" tune="generic"
powerpc_perf="no"
mmx="default" mmx="default"
altivec="default" altivec="default"
mmi="default" mmi="default"
...@@ -275,6 +276,8 @@ for opt do ...@@ -275,6 +276,8 @@ for opt do
;; ;;
--tune=*) tune=`echo $opt | cut -d '=' -f 2` --tune=*) tune=`echo $opt | cut -d '=' -f 2`
;; ;;
--powerpc-perf-enable) powerpc_perf="yes"
;;
--disable-mmx) mmx="no" --disable-mmx) mmx="no"
;; ;;
--disable-altivec) altivec="no" --disable-altivec) altivec="no"
...@@ -398,7 +401,7 @@ if test $tune != "generic"; then ...@@ -398,7 +401,7 @@ if test $tune != "generic"; then
if test $altivec = "no"; then if test $altivec = "no"; then
echo "WARNING: tuning for PPC74xx but altivec disabled !"; echo "WARNING: tuning for PPC74xx but altivec disabled !";
fi fi
TUNECPU=ppc7450 TUNECPU=ppc7400
;; ;;
G5|970|ppc970|PowerPC970|power4*|Power4*) G5|970|ppc970|PowerPC970|power4*|Power4*)
CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc64 -force_cpusubtype_ALL " CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc64 -force_cpusubtype_ALL "
...@@ -749,6 +752,7 @@ echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" ...@@ -749,6 +752,7 @@ echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]"
echo " --cpu=CPU force cpu to CPU [$cpu]" echo " --cpu=CPU force cpu to CPU [$cpu]"
echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)" echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)"
echo " --powerpc-perf-enable enable performance report on PPC (requires enabling PMC)"
echo " --disable-mmx disable mmx usage" echo " --disable-mmx disable mmx usage"
echo " --disable-altivec disable AltiVec usage" echo " --disable-altivec disable AltiVec usage"
echo " --disable-audio-oss disable OSS audio support [default=no]" echo " --disable-audio-oss disable OSS audio support [default=no]"
...@@ -847,10 +851,9 @@ elif test "$cpu" = "sparc64" ; then ...@@ -847,10 +851,9 @@ elif test "$cpu" = "sparc64" ; then
elif test "$cpu" = "powerpc" ; then elif test "$cpu" = "powerpc" ; then
echo "TARGET_ARCH_POWERPC=yes" >> config.mak echo "TARGET_ARCH_POWERPC=yes" >> config.mak
echo "#define ARCH_POWERPC 1" >> $TMPH echo "#define ARCH_POWERPC 1" >> $TMPH
echo "// Enable the next line to get PowerPC performance report" >> $TMPH if test "$powerpc_perf" = "yes"; then
echo "// #define POWERPC_TBL_PERFORMANCE_REPORT 1" >> $TMPH echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH
echo "// Enable the next line to use PMC registers instead of TBL" >> $TMPH fi
echo "// #define POWERPC_PERF_USE_PMC 1" >> $TMPH
elif test "$cpu" = "mips" ; then elif test "$cpu" = "mips" ; then
echo "TARGET_ARCH_MIPS=yes" >> config.mak echo "TARGET_ARCH_MIPS=yes" >> config.mak
echo "#define ARCH_MIPS 1" >> $TMPH echo "#define ARCH_MIPS 1" >> $TMPH
......
ffmpeg.c
View file @ e45a2872
...@@ -2757,10 +2757,10 @@ int main(int argc, char **argv) ...@@ -2757,10 +2757,10 @@ int main(int argc, char **argv)
av_free_static(); av_free_static();
#ifdef POWERPC_TBL_PERFORMANCE_REPORT #ifdef POWERPC_PERFORMANCE_REPORT
extern void powerpc_display_perf_report(void); extern void powerpc_display_perf_report(void);
powerpc_display_perf_report(); powerpc_display_perf_report();
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ #endif /* POWERPC_PERFORMANCE_REPORT */
#ifndef CONFIG_WIN32 #ifndef CONFIG_WIN32
if (received_sigterm) { if (received_sigterm) {
......
libavcodec/ppc/dsputil_altivec.c
View file @ e45a2872
This diff is collapsed.
libavcodec/ppc/dsputil_ppc.c
View file @ e45a2872
...@@ -41,8 +41,8 @@ int mm_support(void) ...@@ -41,8 +41,8 @@ int mm_support(void)
return result; return result;
} }
#ifdef POWERPC_TBL_PERFORMANCE_REPORT #ifdef POWERPC_PERFORMANCE_REPORT
unsigned long long perfdata[powerpc_perf_total][powerpc_data_total]; unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total];
/* list below must match enum in dsputil_ppc.h */ /* list below must match enum in dsputil_ppc.h */
static unsigned char* perfname[] = { static unsigned char* perfname[] = {
"fft_calc_altivec", "fft_calc_altivec",
...@@ -60,53 +60,32 @@ static unsigned char* perfname[] = { ...@@ -60,53 +60,32 @@ static unsigned char* perfname[] = {
"clear_blocks_dcbz32_ppc", "clear_blocks_dcbz32_ppc",
"clear_blocks_dcbz128_ppc" "clear_blocks_dcbz128_ppc"
}; };
#ifdef POWERPC_PERF_USE_PMC
unsigned long long perfdata_pmc2[powerpc_perf_total][powerpc_data_total];
unsigned long long perfdata_pmc3[powerpc_perf_total][powerpc_data_total];
#endif
#include <stdio.h> #include <stdio.h>
#endif #endif
#ifdef POWERPC_TBL_PERFORMANCE_REPORT #ifdef POWERPC_PERFORMANCE_REPORT
void powerpc_display_perf_report(void) void powerpc_display_perf_report(void)
{ {
int i; int i, j;
#ifndef POWERPC_PERF_USE_PMC
fprintf(stderr, "PowerPC performance report\n Values are from the Time Base register, and represent 4 bus cycles.\n");
#else /* POWERPC_PERF_USE_PMC */
fprintf(stderr, "PowerPC performance report\n Values are from the PMC registers, and represent whatever the registers are set to record.\n"); fprintf(stderr, "PowerPC performance report\n Values are from the PMC registers, and represent whatever the registers are set to record.\n");
#endif /* POWERPC_PERF_USE_PMC */
for(i = 0 ; i < powerpc_perf_total ; i++) for(i = 0 ; i < powerpc_perf_total ; i++)
{ {
if (perfdata[i][powerpc_data_num] != (unsigned long long)0) for (j = 0; j < POWERPC_NUM_PMC_ENABLED ; j++)
fprintf(stderr, " Function \"%s\" (pmc1):\n\tmin: %llu\n\tmax: %llu\n\tavg: %1.2lf (%llu)\n", {
perfname[i], if (perfdata[j][i][powerpc_data_num] != (unsigned long long)0)
perfdata[i][powerpc_data_min], fprintf(stderr,
perfdata[i][powerpc_data_max], " Function \"%s\" (pmc%d):\n\tmin: %llu\n\tmax: %llu\n\tavg: %1.2lf (%llu)\n",
(double)perfdata[i][powerpc_data_sum] / perfname[i],
(double)perfdata[i][powerpc_data_num], j+1,
perfdata[i][powerpc_data_num]); perfdata[j][i][powerpc_data_min],
#ifdef POWERPC_PERF_USE_PMC perfdata[j][i][powerpc_data_max],
if (perfdata_pmc2[i][powerpc_data_num] != (unsigned long long)0) (double)perfdata[j][i][powerpc_data_sum] /
fprintf(stderr, " Function \"%s\" (pmc2):\n\tmin: %llu\n\tmax: %llu\n\tavg: %1.2lf (%llu)\n", (double)perfdata[j][i][powerpc_data_num],
perfname[i], perfdata[j][i][powerpc_data_num]);
perfdata_pmc2[i][powerpc_data_min], }
perfdata_pmc2[i][powerpc_data_max],
(double)perfdata_pmc2[i][powerpc_data_sum] /
(double)perfdata_pmc2[i][powerpc_data_num],
perfdata_pmc2[i][powerpc_data_num]);
if (perfdata_pmc3[i][powerpc_data_num] != (unsigned long long)0)
fprintf(stderr, " Function \"%s\" (pmc3):\n\tmin: %llu\n\tmax: %llu\n\tavg: %1.2lf (%llu)\n",
perfname[i],
perfdata_pmc3[i][powerpc_data_min],
perfdata_pmc3[i][powerpc_data_max],
(double)perfdata_pmc3[i][powerpc_data_sum] /
(double)perfdata_pmc3[i][powerpc_data_num],
perfdata_pmc3[i][powerpc_data_num]);
#endif
} }
} }
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ #endif /* POWERPC_PERFORMANCE_REPORT */
/* ***** WARNING ***** WARNING ***** WARNING ***** */ /* ***** WARNING ***** WARNING ***** WARNING ***** */
/* /*
...@@ -135,10 +114,10 @@ void powerpc_display_perf_report(void) ...@@ -135,10 +114,10 @@ void powerpc_display_perf_report(void)
*/ */
void clear_blocks_dcbz32_ppc(DCTELEM *blocks) void clear_blocks_dcbz32_ppc(DCTELEM *blocks)
{ {
POWERPC_TBL_DECLARE(powerpc_clear_blocks_dcbz32, 1); POWERPC_PERF_DECLARE(powerpc_clear_blocks_dcbz32, 1);
register int misal = ((unsigned long)blocks & 0x00000010); register int misal = ((unsigned long)blocks & 0x00000010);
register int i = 0; register int i = 0;
POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz32, 1); POWERPC_PERF_START_COUNT(powerpc_clear_blocks_dcbz32, 1);
#if 1 #if 1
if (misal) { if (misal) {
((unsigned long*)blocks)[0] = 0L; ((unsigned long*)blocks)[0] = 0L;
...@@ -160,7 +139,7 @@ POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz32, 1); ...@@ -160,7 +139,7 @@ POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz32, 1);
#else #else
memset(blocks, 0, sizeof(DCTELEM)*6*64); memset(blocks, 0, sizeof(DCTELEM)*6*64);
#endif #endif
POWERPC_TBL_STOP_COUNT(powerpc_clear_blocks_dcbz32, 1); POWERPC_PERF_STOP_COUNT(powerpc_clear_blocks_dcbz32, 1);
} }
/* same as above, when dcbzl clear a whole 128B cache line /* same as above, when dcbzl clear a whole 128B cache line
...@@ -168,10 +147,10 @@ POWERPC_TBL_STOP_COUNT(powerpc_clear_blocks_dcbz32, 1); ...@@ -168,10 +147,10 @@ POWERPC_TBL_STOP_COUNT(powerpc_clear_blocks_dcbz32, 1);
#ifndef NO_DCBZL #ifndef NO_DCBZL
void clear_blocks_dcbz128_ppc(DCTELEM *blocks) void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
{ {
POWERPC_TBL_DECLARE(powerpc_clear_blocks_dcbz128, 1); POWERPC_PERF_DECLARE(powerpc_clear_blocks_dcbz128, 1);
register int misal = ((unsigned long)blocks & 0x0000007f); register int misal = ((unsigned long)blocks & 0x0000007f);
register int i = 0; register int i = 0;
POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz128, 1); POWERPC_PERF_START_COUNT(powerpc_clear_blocks_dcbz128, 1);
#if 1 #if 1
if (misal) { if (misal) {
// we could probably also optimize this case, // we could probably also optimize this case,
...@@ -186,7 +165,7 @@ POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz128, 1); ...@@ -186,7 +165,7 @@ POWERPC_TBL_START_COUNT(powerpc_clear_blocks_dcbz128, 1);
#else #else
memset(blocks, 0, sizeof(DCTELEM)*6*64); memset(blocks, 0, sizeof(DCTELEM)*6*64);
#endif #endif
POWERPC_TBL_STOP_COUNT(powerpc_clear_blocks_dcbz128, 1); POWERPC_PERF_STOP_COUNT(powerpc_clear_blocks_dcbz128, 1);
} }
#else #else
void clear_blocks_dcbz128_ppc(DCTELEM *blocks) void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
...@@ -277,6 +256,8 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) ...@@ -277,6 +256,8 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
c->add_bytes= add_bytes_altivec; c->add_bytes= add_bytes_altivec;
#endif /* 0 */ #endif /* 0 */
c->put_pixels_tab[0][0] = put_pixels16_altivec; c->put_pixels_tab[0][0] = put_pixels16_altivec;
/* the tow functions do the same thing, so use the same code */
c->put_no_rnd_pixels_tab[0][0] = put_pixels16_altivec;
c->avg_pixels_tab[0][0] = avg_pixels16_altivec; c->avg_pixels_tab[0][0] = avg_pixels16_altivec;
// next one disabled as it's untested. // next one disabled as it's untested.
#if 0 #if 0
...@@ -301,28 +282,21 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) ...@@ -301,28 +282,21 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
#ifdef POWERPC_TBL_PERFORMANCE_REPORT #ifdef POWERPC_PERFORMANCE_REPORT
{ {
int i; int i, j;
for (i = 0 ; i < powerpc_perf_total ; i++) for (i = 0 ; i < powerpc_perf_total ; i++)
{ {
perfdata[i][powerpc_data_min] = 0xFFFFFFFFFFFFFFFF; for (j = 0; j < POWERPC_NUM_PMC_ENABLED ; j++)
perfdata[i][powerpc_data_max] = 0x0000000000000000; {
perfdata[i][powerpc_data_sum] = 0x0000000000000000; perfdata[j][i][powerpc_data_min] = (unsigned long long)0xFFFFFFFFFFFFFFFF;
perfdata[i][powerpc_data_num] = 0x0000000000000000; perfdata[j][i][powerpc_data_max] = (unsigned long long)0x0000000000000000;
#ifdef POWERPC_PERF_USE_PMC perfdata[j][i][powerpc_data_sum] = (unsigned long long)0x0000000000000000;
perfdata_pmc2[i][powerpc_data_min] = 0xFFFFFFFFFFFFFFFF; perfdata[j][i][powerpc_data_num] = (unsigned long long)0x0000000000000000;
perfdata_pmc2[i][powerpc_data_max] = 0x0000000000000000; }
perfdata_pmc2[i][powerpc_data_sum] = 0x0000000000000000; }
perfdata_pmc2[i][powerpc_data_num] = 0x0000000000000000;
perfdata_pmc3[i][powerpc_data_min] = 0xFFFFFFFFFFFFFFFF;
perfdata_pmc3[i][powerpc_data_max] = 0x0000000000000000;
perfdata_pmc3[i][powerpc_data_sum] = 0x0000000000000000;
perfdata_pmc3[i][powerpc_data_num] = 0x0000000000000000;
#endif /* POWERPC_PERF_USE_PMC */
}
} }
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ #endif /* POWERPC_PERFORMANCE_REPORT */
} else } else
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
{ {
......
libavcodec/ppc/dsputil_ppc.h
View file @ e45a2872
...@@ -30,8 +30,10 @@ ...@@ -30,8 +30,10 @@
#define NO_DCBZL #define NO_DCBZL
#endif /* CONFIG_DARWIN */ #endif /* CONFIG_DARWIN */
#ifdef POWERPC_TBL_PERFORMANCE_REPORT #ifdef POWERPC_PERFORMANCE_REPORT
void powerpc_display_perf_report(void); void powerpc_display_perf_report(void);
/* the 604* have 2, the G3* have 4, the G4s have 6 */
#define POWERPC_NUM_PMC_ENABLED 4
/* if you add to the enum below, also add to the perfname array /* if you add to the enum below, also add to the perfname array
in dsputil_ppc.c */ in dsputil_ppc.c */
enum powerpc_perf_index { enum powerpc_perf_index {
...@@ -58,98 +60,65 @@ enum powerpc_data_index { ...@@ -58,98 +60,65 @@ enum powerpc_data_index {
powerpc_data_num, powerpc_data_num,
powerpc_data_total powerpc_data_total
}; };
extern unsigned long long perfdata[powerpc_perf_total][powerpc_data_total]; extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total];
#ifdef POWERPC_PERF_USE_PMC
extern unsigned long long perfdata_pmc2[powerpc_perf_total][powerpc_data_total];
extern unsigned long long perfdata_pmc3[powerpc_perf_total][powerpc_data_total];
#endif
#ifndef POWERPC_PERF_USE_PMC
#define POWERPC_GET_CYCLES(a) asm volatile("mftb %0" : "=r" (a))
#define POWERPC_TBL_DECLARE(a, cond) register unsigned long tbl_start, tbl_stop
#define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_CYCLES(tbl_start); } while (0)
#define POWERPC_TBL_STOP_COUNT(a, cond) do { \
POWERPC_GET_CYCLES(tbl_stop); \
if (tbl_stop > tbl_start) \
{ \
unsigned long diff = tbl_stop - tbl_start; \
if (cond) \
{ \
if (diff < perfdata[a][powerpc_data_min]) \
perfdata[a][powerpc_data_min] = diff; \
if (diff > perfdata[a][powerpc_data_max]) \
perfdata[a][powerpc_data_max] = diff; \
perfdata[a][powerpc_data_sum] += diff; \
perfdata[a][powerpc_data_num] ++; \
} \
} \
} while (0)
#else /* POWERPC_PERF_USE_PMC */ #define POWERPC_GET_PMC1(a) asm volatile("mfspr %0, 937" : "=r" (a))
#define POWERPC_GET_CYCLES(a) asm volatile("mfspr %0, 937" : "=r" (a))
#define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 938" : "=r" (a)) #define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 938" : "=r" (a))
#if (POWERPC_NUM_PMC_ENABLED > 2)
#define POWERPC_GET_PMC3(a) asm volatile("mfspr %0, 941" : "=r" (a)) #define POWERPC_GET_PMC3(a) asm volatile("mfspr %0, 941" : "=r" (a))
#define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, pmc2_start, pmc2_stop, pmc3_start, pmc3_stop #define POWERPC_GET_PMC4(a) asm volatile("mfspr %0, 942" : "=r" (a))
#define POWERPC_TBL_START_COUNT(a, cond) do { \ #else
POWERPC_GET_PMC3(pmc3_start); \ #define POWERPC_GET_PMC3(a) do {} while (0)
POWERPC_GET_PMC2(pmc2_start); \ #define POWERPC_GET_PMC4(a) do {} while (0)
POWERPC_GET_CYCLES(cycles_start); } while (0) #endif
#define POWERPC_TBL_STOP_COUNT(a, cond) do { \ #if (POWERPC_NUM_PMC_ENABLED > 4)
POWERPC_GET_CYCLES(cycles_stop); \ #define POWERPC_GET_PMC5(a) asm volatile("mfspr %0, 929" : "=r" (a))
POWERPC_GET_PMC2(pmc2_stop); \ #define POWERPC_GET_PMC6(a) asm volatile("mfspr %0, 930" : "=r" (a))
POWERPC_GET_PMC3(pmc3_stop); \ #else
if (cycles_stop >= cycles_start) \ #define POWERPC_GET_PMC5(a) do {} while (0)
{ \ #define POWERPC_GET_PMC6(a) do {} while (0)
unsigned long diff = \ #endif
cycles_stop - cycles_start; \ #define POWERPC_PERF_DECLARE(a, cond) unsigned long pmc_start[POWERPC_NUM_PMC_ENABLED], pmc_stop[POWERPC_NUM_PMC_ENABLED], pmc_loop_index;
if (cond) \ #define POWERPC_PERF_START_COUNT(a, cond) do { \
{ \ POWERPC_GET_PMC6(pmc_start[5]); \
if (diff < perfdata[a][powerpc_data_min]) \ POWERPC_GET_PMC5(pmc_start[4]); \
perfdata[a][powerpc_data_min] = diff; \ POWERPC_GET_PMC4(pmc_start[3]); \
if (diff > perfdata[a][powerpc_data_max]) \ POWERPC_GET_PMC3(pmc_start[2]); \
perfdata[a][powerpc_data_max] = diff; \ POWERPC_GET_PMC2(pmc_start[1]); \
perfdata[a][powerpc_data_sum] += diff; \ POWERPC_GET_PMC1(pmc_start[0]); \
perfdata[a][powerpc_data_num] ++; \ } while (0)
} \ #define POWERPC_PERF_STOP_COUNT(a, cond) do { \
} \ POWERPC_GET_PMC1(pmc_stop[0]); \
if (pmc2_stop >= pmc2_start) \ POWERPC_GET_PMC2(pmc_stop[1]); \
{ \ POWERPC_GET_PMC3(pmc_stop[2]); \
unsigned long diff = \ POWERPC_GET_PMC4(pmc_stop[3]); \
pmc2_stop - pmc2_start; \ POWERPC_GET_PMC5(pmc_stop[4]); \
if (cond) \ POWERPC_GET_PMC6(pmc_stop[5]); \
{ \ if (cond) \
if (diff < perfdata_pmc2[a][powerpc_data_min]) \ { \
perfdata_pmc2[a][powerpc_data_min] = diff; \ for(pmc_loop_index = 0; \
if (diff > perfdata_pmc2[a][powerpc_data_max]) \ pmc_loop_index < POWERPC_NUM_PMC_ENABLED; \
perfdata_pmc2[a][powerpc_data_max] = diff; \ pmc_loop_index++) \
perfdata_pmc2[a][powerpc_data_sum] += diff; \ { \
perfdata_pmc2[a][powerpc_data_num] ++; \ if (pmc_stop[pmc_loop_index] >= pmc_start[pmc_loop_index]) \
} \ { \
} \ unsigned long diff = \
if (pmc3_stop >= pmc3_start) \ pmc_stop[pmc_loop_index] - pmc_start[pmc_loop_index]; \
{ \ if (diff < perfdata[pmc_loop_index][a][powerpc_data_min]) \
unsigned long diff = \ perfdata[pmc_loop_index][a][powerpc_data_min] = diff; \
pmc3_stop - pmc3_start; \ if (diff > perfdata[pmc_loop_index][a][powerpc_data_max]) \
if (cond) \ perfdata[pmc_loop_index][a][powerpc_data_max] = diff; \
{ \ perfdata[pmc_loop_index][a][powerpc_data_sum] += diff; \
if (diff < perfdata_pmc3[a][powerpc_data_min]) \ perfdata[pmc_loop_index][a][powerpc_data_num] ++; \
perfdata_pmc3[a][powerpc_data_min] = diff; \ } \
if (diff > perfdata_pmc3[a][powerpc_data_max]) \ } \
perfdata_pmc3[a][powerpc_data_max] = diff; \ } \
perfdata_pmc3[a][powerpc_data_sum] += diff; \
perfdata_pmc3[a][powerpc_data_num] ++; \
} \
} \
} while (0) } while (0)
#else /* POWERPC_PERFORMANCE_REPORT */
#endif /* POWERPC_PERF_USE_PMC */
#else /* POWERPC_TBL_PERFORMANCE_REPORT */
// those are needed to avoid empty statements. // those are needed to avoid empty statements.
#define POWERPC_TBL_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused)) #define POWERPC_PERF_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused))
#define POWERPC_TBL_START_COUNT(a, cond) do {} while (0) #define POWERPC_PERF_START_COUNT(a, cond) do {} while (0)
#define POWERPC_TBL_STOP_COUNT(a, cond) do {} while (0) #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0)
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ #endif /* POWERPC_PERFORMANCE_REPORT */
#endif /* _DSPUTIL_PPC_ */ #endif /* _DSPUTIL_PPC_ */
libavcodec/ppc/fft_altivec.c
View file @ e45a2872
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
*/ */
void fft_calc_altivec(FFTContext *s, FFTComplex *z) void fft_calc_altivec(FFTContext *s, FFTComplex *z)
{ {
POWERPC_TBL_DECLARE(altivec_fft_num, s->nbits >= 6); POWERPC_PERF_DECLARE(altivec_fft_num, s->nbits >= 6);
#ifdef ALTIVEC_USE_REFERENCE_C_CODE #ifdef ALTIVEC_USE_REFERENCE_C_CODE
int ln = s->nbits; int ln = s->nbits;
int j, np, np2; int j, np, np2;
...@@ -72,7 +72,7 @@ POWERPC_TBL_DECLARE(altivec_fft_num, s->nbits >= 6); ...@@ -72,7 +72,7 @@ POWERPC_TBL_DECLARE(altivec_fft_num, s->nbits >= 6);
int l; int l;
FFTSample tmp_re, tmp_im; FFTSample tmp_re, tmp_im;
POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6); POWERPC_PERF_START_COUNT(altivec_fft_num, s->nbits >= 6);
np = 1 << ln; np = 1 << ln;
...@@ -137,7 +137,7 @@ POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6); ...@@ -137,7 +137,7 @@ POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6);
nloops = nloops << 1; nloops = nloops << 1;
} while (nblocks != 0); } while (nblocks != 0);
POWERPC_TBL_STOP_COUNT(altivec_fft_num, s->nbits >= 6); POWERPC_PERF_STOP_COUNT(altivec_fft_num, s->nbits >= 6);
#else /* ALTIVEC_USE_REFERENCE_C_CODE */ #else /* ALTIVEC_USE_REFERENCE_C_CODE */
#ifdef CONFIG_DARWIN #ifdef CONFIG_DARWIN
...@@ -153,7 +153,7 @@ POWERPC_TBL_STOP_COUNT(altivec_fft_num, s->nbits >= 6); ...@@ -153,7 +153,7 @@ POWERPC_TBL_STOP_COUNT(altivec_fft_num, s->nbits >= 6);
FFTComplex *cptr, *cptr1; FFTComplex *cptr, *cptr1;
int k; int k;
POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6); POWERPC_PERF_START_COUNT(altivec_fft_num, s->nbits >= 6);
np = 1 << ln; np = 1 << ln;
...@@ -241,7 +241,7 @@ POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6); ...@@ -241,7 +241,7 @@ POWERPC_TBL_START_COUNT(altivec_fft_num, s->nbits >= 6);
nloops = nloops << 1; nloops = nloops << 1;
} while (nblocks != 0); } while (nblocks != 0);
POWERPC_TBL_STOP_COUNT(altivec_fft_num, s->nbits >= 6); POWERPC_PERF_STOP_COUNT(altivec_fft_num, s->nbits >= 6);
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
libavcodec/ppc/gmc_altivec.c
View file @ e45a2872
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define GMC1_PERF_COND (h==8) #define GMC1_PERF_COND (h==8)
void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder) void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder)
{ {
POWERPC_TBL_DECLARE(altivec_gmc1_num, GMC1_PERF_COND); POWERPC_PERF_DECLARE(altivec_gmc1_num, GMC1_PERF_COND);
#ifdef ALTIVEC_USE_REFERENCE_C_CODE #ifdef ALTIVEC_USE_REFERENCE_C_CODE
const int A=(16-x16)*(16-y16); const int A=(16-x16)*(16-y16);
const int B=( x16)*(16-y16); const int B=( x16)*(16-y16);
...@@ -39,7 +39,7 @@ POWERPC_TBL_DECLARE(altivec_gmc1_num, GMC1_PERF_COND); ...@@ -39,7 +39,7 @@ POWERPC_TBL_DECLARE(altivec_gmc1_num, GMC1_PERF_COND);
const int D=( x16)*( y16); const int D=( x16)*( y16);
int i; int i;
POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND); POWERPC_PERF_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
for(i=0; i<h; i++) for(i=0; i<h; i++)
{ {
...@@ -55,7 +55,7 @@ POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND); ...@@ -55,7 +55,7 @@ POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
src+= stride; src+= stride;
} }
POWERPC_TBL_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND); POWERPC_PERF_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
#else /* ALTIVEC_USE_REFERENCE_C_CODE */ #else /* ALTIVEC_USE_REFERENCE_C_CODE */
const unsigned short __attribute__ ((aligned(16))) rounder_a[8] = const unsigned short __attribute__ ((aligned(16))) rounder_a[8] =
...@@ -78,7 +78,7 @@ POWERPC_TBL_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND); ...@@ -78,7 +78,7 @@ POWERPC_TBL_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
unsigned long src_really_odd = (unsigned long)src & 0x0000000F; unsigned long src_really_odd = (unsigned long)src & 0x0000000F;
POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND); POWERPC_PERF_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
tempA = vec_ld(0, (unsigned short*)ABCD); tempA = vec_ld(0, (unsigned short*)ABCD);
Av = vec_splat(tempA, 0); Av = vec_splat(tempA, 0);
...@@ -166,7 +166,7 @@ POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND); ...@@ -166,7 +166,7 @@ POWERPC_TBL_START_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
src += stride; src += stride;
} }
POWERPC_TBL_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND); POWERPC_PERF_STOP_COUNT(altivec_gmc1_num, GMC1_PERF_COND);
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
libavcodec/ppc/idct_altivec.c
View file @ e45a2872
...@@ -165,16 +165,16 @@ static const vector_s16_t constants[5] = { ...@@ -165,16 +165,16 @@ static const vector_s16_t constants[5] = {
void idct_put_altivec(uint8_t* dest, int stride, vector_s16_t* block) void idct_put_altivec(uint8_t* dest, int stride, vector_s16_t* block)
{ {
POWERPC_TBL_DECLARE(altivec_idct_put_num, 1); POWERPC_PERF_DECLARE(altivec_idct_put_num, 1);
#ifdef ALTIVEC_USE_REFERENCE_C_CODE #ifdef ALTIVEC_USE_REFERENCE_C_CODE
POWERPC_TBL_START_COUNT(altivec_idct_put_num, 1); POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1);
void simple_idct_put(uint8_t *dest, int line_size, int16_t *block); void simple_idct_put(uint8_t *dest, int line_size, int16_t *block);
simple_idct_put(dest, stride, (int16_t*)block); simple_idct_put(dest, stride, (int16_t*)block);
POWERPC_TBL_STOP_COUNT(altivec_idct_put_num, 1); POWERPC_PERF_STOP_COUNT(altivec_idct_put_num, 1);
#else /* ALTIVEC_USE_REFERENCE_C_CODE */ #else /* ALTIVEC_USE_REFERENCE_C_CODE */
vector_u8_t tmp; vector_u8_t tmp;
POWERPC_TBL_START_COUNT(altivec_idct_put_num, 1); POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1);
IDCT IDCT
...@@ -192,18 +192,18 @@ POWERPC_TBL_START_COUNT(altivec_idct_put_num, 1); ...@@ -192,18 +192,18 @@ POWERPC_TBL_START_COUNT(altivec_idct_put_num, 1);
COPY (dest, vx6) dest += stride; COPY (dest, vx6) dest += stride;
COPY (dest, vx7) COPY (dest, vx7)
POWERPC_TBL_STOP_COUNT(altivec_idct_put_num, 1); POWERPC_PERF_STOP_COUNT(altivec_idct_put_num, 1);
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
void idct_add_altivec(uint8_t* dest, int stride, vector_s16_t* block) void idct_add_altivec(uint8_t* dest, int stride, vector_s16_t* block)
{ {
POWERPC_TBL_DECLARE(altivec_idct_add_num, 1); POWERPC_PERF_DECLARE(altivec_idct_add_num, 1);
#ifdef ALTIVEC_USE_REFERENCE_C_CODE #ifdef ALTIVEC_USE_REFERENCE_C_CODE
POWERPC_TBL_START_COUNT(altivec_idct_add_num, 1); POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1);
void simple_idct_add(uint8_t *dest, int line_size, int16_t *block); void simple_idct_add(uint8_t *dest, int line_size, int16_t *block);
simple_idct_add(dest, stride, (int16_t*)block); simple_idct_add(dest, stride, (int16_t*)block);
POWERPC_TBL_STOP_COUNT(altivec_idct_add_num, 1); POWERPC_PERF_STOP_COUNT(altivec_idct_add_num, 1);
#else /* ALTIVEC_USE_REFERENCE_C_CODE */ #else /* ALTIVEC_USE_REFERENCE_C_CODE */
vector_u8_t tmp; vector_u8_t tmp;
vector_s16_t tmp2, tmp3; vector_s16_t tmp2, tmp3;
...@@ -211,7 +211,7 @@ POWERPC_TBL_STOP_COUNT(altivec_idct_add_num, 1); ...@@ -211,7 +211,7 @@ POWERPC_TBL_STOP_COUNT(altivec_idct_add_num, 1);
vector_u8_t perm1; vector_u8_t perm1;
vector_u8_t p0, p1, p; vector_u8_t p0, p1, p;
POWERPC_TBL_START_COUNT(altivec_idct_add_num, 1); POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1);
IDCT IDCT
...@@ -239,7 +239,7 @@ POWERPC_TBL_START_COUNT(altivec_idct_add_num, 1); ...@@ -239,7 +239,7 @@ POWERPC_TBL_START_COUNT(altivec_idct_add_num, 1);
ADD (dest, vx6, perm0) dest += stride; ADD (dest, vx6, perm0) dest += stride;
ADD (dest, vx7, perm1) ADD (dest, vx7, perm1)
POWERPC_TBL_STOP_COUNT(altivec_idct_add_num, 1); POWERPC_PERF_STOP_COUNT(altivec_idct_add_num, 1);
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
libavcodec/ppc/mpegvideo_altivec.c
View file @ e45a2872
...@@ -522,13 +522,13 @@ int dct_quantize_altivec(MpegEncContext* s, ...@@ -522,13 +522,13 @@ int dct_quantize_altivec(MpegEncContext* s,
void dct_unquantize_h263_altivec(MpegEncContext *s, void dct_unquantize_h263_altivec(MpegEncContext *s,
DCTELEM *block, int n, int qscale) DCTELEM *block, int n, int qscale)
{ {
POWERPC_TBL_DECLARE(altivec_dct_unquantize_h263_num, 1); POWERPC_PERF_DECLARE(altivec_dct_unquantize_h263_num, 1);
int i, level, qmul, qadd; int i, level, qmul, qadd;
int nCoeffs; int nCoeffs;
assert(s->block_last_index[n]>=0); assert(s->block_last_index[n]>=0);
POWERPC_TBL_START_COUNT(altivec_dct_unquantize_h263_num, 1); POWERPC_PERF_START_COUNT(altivec_dct_unquantize_h263_num, 1);
qadd = (qscale - 1) | 1; qadd = (qscale - 1) | 1;
qmul = qscale << 1; qmul = qscale << 1;
...@@ -641,5 +641,5 @@ POWERPC_TBL_START_COUNT(altivec_dct_unquantize_h263_num, 1); ...@@ -641,5 +641,5 @@ POWERPC_TBL_START_COUNT(altivec_dct_unquantize_h263_num, 1);
} }
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
POWERPC_TBL_STOP_COUNT(altivec_dct_unquantize_h263_num, nCoeffs == 63); POWERPC_PERF_STOP_COUNT(altivec_dct_unquantize_h263_num, nCoeffs == 63);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment