From 35f973698885e2688b271e03d888595f4dbe1cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 13 Feb 2007 23:45:28 +0000 Subject: [PATCH] rename POWERPC_PERFORMANCE_REPORT to CONFIG_POWERPC_PERF Originally committed as revision 7968 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 2 +- ffmpeg.c | 4 ++-- libavcodec/ppc/dsputil_ppc.c | 10 +++++----- libavcodec/ppc/dsputil_ppc.h | 6 +++--- libavcodec/ppc/idct_altivec.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index ae4231ab35..25f2b77098 100755 --- a/configure +++ b/configure @@ -1891,7 +1891,7 @@ case "$arch" in echo "#define POWERPC_MODE_64BITS 1" >> $TMPH fi if enabled powerpc_perf; then - echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH + echo "#define CONFIG_POWERPC_PERF 1" >> $TMPH fi ;; sparc64) diff --git a/ffmpeg.c b/ffmpeg.c index a98c7e9b7d..7eb7011e84 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3963,10 +3963,10 @@ int main(int argc, char **argv) if(inter_matrix) av_free(inter_matrix); -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF extern void powerpc_display_perf_report(void); powerpc_display_perf_report(); -#endif /* POWERPC_PERFORMANCE_REPORT */ +#endif /* CONFIG_POWERPC_PERF */ if (received_sigterm) { fprintf(stderr, diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 9169eaef05..117a7adf13 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -55,7 +55,7 @@ int mm_support(void) return result; } -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; /* list below must match enum in dsputil_ppc.h */ static unsigned char* perfname[] = { @@ -90,7 +90,7 @@ static unsigned char* perfname[] = { #include #endif -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF void powerpc_display_perf_report(void) { int i, j; @@ -112,7 +112,7 @@ void powerpc_display_perf_report(void) } } } -#endif /* POWERPC_PERFORMANCE_REPORT */ +#endif /* CONFIG_POWERPC_PERF */ /* ***** WARNING ***** WARNING ***** WARNING ***** */ /* @@ -305,7 +305,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) } } -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF { int i, j; for (i = 0 ; i < powerpc_perf_total ; i++) @@ -319,7 +319,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) } } } -#endif /* POWERPC_PERFORMANCE_REPORT */ +#endif /* CONFIG_POWERPC_PERF */ } #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h index ab2b05780f..5b25732b2d 100644 --- a/libavcodec/ppc/dsputil_ppc.h +++ b/libavcodec/ppc/dsputil_ppc.h @@ -21,7 +21,7 @@ #ifndef _DSPUTIL_PPC_ #define _DSPUTIL_PPC_ -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); /* the 604* have 2, the G3* have 4, the G4s have 6, and the G5 are completely different (they MUST use @@ -145,11 +145,11 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ } \ } \ } while (0) -#else /* POWERPC_PERFORMANCE_REPORT */ +#else /* CONFIG_POWERPC_PERF */ // those are needed to avoid empty statements. #define POWERPC_PERF_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused)) #define POWERPC_PERF_START_COUNT(a, cond) do {} while (0) #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) -#endif /* POWERPC_PERFORMANCE_REPORT */ +#endif /* CONFIG_POWERPC_PERF */ #endif /* _DSPUTIL_PPC_ */ diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index cee46fc25a..66c8082f76 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -171,7 +171,7 @@ void idct_put_altivec(uint8_t* dest, int stride, vector_s16_t* block) POWERPC_PERF_DECLARE(altivec_idct_put_num, 1); vector_u8_t tmp; -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1); #endif IDCT @@ -202,7 +202,7 @@ POWERPC_PERF_DECLARE(altivec_idct_add_num, 1); vector_u8_t perm1; vector_u8_t p0, p1, p; -#ifdef POWERPC_PERFORMANCE_REPORT +#ifdef CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1); #endif