Browse Source

rename POWERPC_PERFORMANCE_REPORT to CONFIG_POWERPC_PERF

Originally committed as revision 7968 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 18 years ago
parent
commit
35f9736988
5 changed files with 13 additions and 13 deletions
  1. +1
    -1
      configure
  2. +2
    -2
      ffmpeg.c
  3. +5
    -5
      libavcodec/ppc/dsputil_ppc.c
  4. +3
    -3
      libavcodec/ppc/dsputil_ppc.h
  5. +2
    -2
      libavcodec/ppc/idct_altivec.c

+ 1
- 1
configure View File

@@ -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)


+ 2
- 2
ffmpeg.c View File

@@ -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,


+ 5
- 5
libavcodec/ppc/dsputil_ppc.c View File

@@ -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 <stdio.h>
#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 */
}

+ 3
- 3
libavcodec/ppc/dsputil_ppc.h View File

@@ -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_ */

+ 2
- 2
libavcodec/ppc/idct_altivec.c View File

@@ -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



Loading…
Cancel
Save