(GX) Add performance counters for gx_video

gx/gx_video.c

@@ -889,10 +889,14 @@ static bool gx_frame(void *data, const void *frame,
       unsigned width, unsigned height, unsigned pitch,
       const char *msg)
 {
+
    gx_video_t *gx = (gx_video_t*)data;
    struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs;
    u8 clear_efb = GX_FALSE;
 
+   RARCH_PERFORMANCE_INIT(gx_frame);
+   RARCH_PERFORMANCE_START(gx_frame);
+
    if(!gx || (!frame && !gx->rgui_texture_enable))
       return true;
 
@@ -915,9 +919,13 @@ static bool gx_frame(void *data, const void *frame,
 
    if (width != gx_old_width || height != gx_old_height)
    {
+      RARCH_PERFORMANCE_INIT(gx_frame_resize);
+      RARCH_PERFORMANCE_START(gx_frame_resize);
       init_texture(data, width, height);
       gx_old_width = width;
       gx_old_height = height;
+
+      RARCH_PERFORMANCE_STOP(gx_frame_resize);
    }
 
    g_draw_done = false;
@@ -926,6 +934,9 @@ static bool gx_frame(void *data, const void *frame,
 
    if (frame)
    {
+      RARCH_PERFORMANCE_INIT(gx_frame_convert);
+      RARCH_PERFORMANCE_START(gx_frame_convert);
+
       if (gx->rgb32)
          convert_texture32(frame, g_tex.data, width, height, pitch);
       else if (gx->rgui_texture_enable)
@@ -933,6 +944,8 @@ static bool gx_frame(void *data, const void *frame,
       else
          convert_texture16(frame, g_tex.data, width, height, pitch);
       DCFlushRange(g_tex.data, height * (width << (gx->rgb32 ? 2 : 1)));
+
+      RARCH_PERFORMANCE_STOP(gx_frame_convert);
    }
 
    if (gx->rgui_texture_enable && gx->menu_data)
@@ -998,6 +1011,8 @@ static bool gx_frame(void *data, const void *frame,
 
    g_extern.frame_count++;
 
+   RARCH_PERFORMANCE_STOP(gx_frame);
+
    return true;
 }
 

gx/gx_video_inl.h

@@ -359,13 +359,16 @@ static void __SETVCDATTR(struct __gx_regdef *__gx, u8 attr,u8 type)
 #ifdef HW_DOL
 static inline void __GX_UpdateBPMask(struct __gx_regdef *__gx)
 {
-   u32 i;
+   u32 i, nbmp, nres;
-   u32 nbmp,nres;
    u8 ntexmap;
+
    nbmp = _SHIFTR(__gx->genMode,16,3);
    nres = 0;
-   for(i=0;i<nbmp;i++) {
+
-      switch(i) {
+   for(i = 0; i < nbmp; i++)
+   {
+      switch (i)
+      {
          case GX_INDTEXSTAGE0:
             ntexmap = __gx->tevRasOrder[2] & 7;
             break;
@@ -384,7 +387,9 @@ static inline void __GX_UpdateBPMask(struct __gx_regdef *__gx)
       }
       nres |= (1<<ntexmap);
    }
-   if((__gx->tevIndMask & 0xff)!=nres) {
+
+   if((__gx->tevIndMask & 0xff)!=nres)
+   {
       __gx->tevIndMask = (__gx->tevIndMask & ~0xff)|(nres & 0xff);
       GX_LOAD_BP_REG(__gx->tevIndMask);
    }
@@ -436,7 +441,7 @@ static inline void __GX_SetTexCoordGen(struct __gx_regdef *__gx)
 static void __SetSURegs(struct __gx_regdef *__gx, u8 texmap,u8 texcoord)
 {
    u32 reg;
-   u16 wd,ht;
+   u16 wd, ht;
    u8 wrap_s,wrap_t;
 
    wd = __gx->texMapSize[texmap] & 0x3ff;
@@ -456,17 +461,17 @@ static void __SetSURegs(struct __gx_regdef *__gx, u8 texmap,u8 texcoord)
 
 static inline void __GX_SetSUTexRegs(struct __gx_regdef *__gx)
 {
-   u32 i;
+   u32 i, indtev, dirtev, tevreg, tevm, texcm;
-   u32 indtev,dirtev;
+   u8 texcoord, texmap;
-   u8 texcoord,texmap;
-   u32 tevreg,tevm,texcm;
 
    dirtev = (_SHIFTR(__gx->genMode,10,4))+1;
    indtev = _SHIFTR(__gx->genMode,16,3);
 
    //indirect texture order
-   for(i=0;i<indtev;i++) {
+   for(i = 0;i < indtev; i++)
-      switch(i) {
+   {
+      switch(i)
+      {
          case GX_INDTEXSTAGE0:
             texmap = __gx->tevRasOrder[2] & 7;
             texcoord = _SHIFTR(__gx->tevRasOrder[2],3,3);
@@ -490,12 +495,13 @@ static inline void __GX_SetSUTexRegs(struct __gx_regdef *__gx)
       }
 
       texcm = _SHIFTL(1,texcoord,1);
+
       if(!(__gx->texCoordManually & texcm))
          __SetSURegs(__gx, texmap,texcoord);
    }
 
    //direct texture order
-   for(i=0;i<dirtev;i++)
+   for(i = 0; i < dirtev; i++)
    {
       tevreg = 3+(_SHIFTR(i,1,3));
       texmap = (__gx->tevTexMap[i] & 0xff);
@@ -748,68 +754,6 @@ static inline void __GX_SetViewportJitter(f32 xOrig,f32 yOrig,f32 wd,f32 ht,f32
    FIFO_PUTF32(f);
 }
 
-#if 0
-static void __GX_SetCopyFilter(u8 aa,u8 sample_pattern[12][2],u8 vf,u8 vfilter[7])
-{
-   u32 reg01=0,reg02=0,reg03=0,reg04=0,reg53=0,reg54=0;
-   if(aa)
-   {
-      reg01 = sample_pattern[0][0]&0xf;
-      reg01 = (reg01&~0xf0)|(_SHIFTL(sample_pattern[0][1],4,4));
-      reg01 = (reg01&~0xf00)|(_SHIFTL(sample_pattern[1][0],8,4));
-      reg01 = (reg01&~0xf000)|(_SHIFTL(sample_pattern[1][1],12,4));
-      reg01 = (reg01&~0xf0000)|(_SHIFTL(sample_pattern[2][0],16,4));
-      reg01 = (reg01&~0xf00000)|(_SHIFTL(sample_pattern[2][1],20,4));
-      reg01 = (reg01&~0xff000000)|(_SHIFTL(0x01,24,8));
-      reg02 = sample_pattern[3][0]&0xf;
-      reg02 = (reg02&~0xf0)|(_SHIFTL(sample_pattern[3][1],4,4));
-      reg02 = (reg02&~0xf00)|(_SHIFTL(sample_pattern[4][0],8,4));
-      reg02 = (reg02&~0xf000)|(_SHIFTL(sample_pattern[4][1],12,4));
-      reg02 = (reg02&~0xf0000)|(_SHIFTL(sample_pattern[5][0],16,4));
-      reg02 = (reg02&~0xf00000)|(_SHIFTL(sample_pattern[5][1],20,4));
-      reg02 = (reg02&~0xff000000)|(_SHIFTL(0x02,24,8));
-      reg03 = sample_pattern[6][0]&0xf;
-      reg03 = (reg03&~0xf0)|(_SHIFTL(sample_pattern[6][1],4,4));
-      reg03 = (reg03&~0xf00)|(_SHIFTL(sample_pattern[7][0],8,4));
-      reg03 = (reg03&~0xf000)|(_SHIFTL(sample_pattern[7][1],12,4));
-      reg03 = (reg03&~0xf0000)|(_SHIFTL(sample_pattern[8][0],16,4));
-      reg03 = (reg03&~0xf00000)|(_SHIFTL(sample_pattern[8][1],20,4));
-      reg03 = (reg03&~0xff000000)|(_SHIFTL(0x03,24,8));
-      reg04 = sample_pattern[9][0]&0xf;
-      reg04 = (reg04&~0xf0)|(_SHIFTL(sample_pattern[9][1],4,4));
-      reg04 = (reg04&~0xf00)|(_SHIFTL(sample_pattern[10][0],8,4));
-      reg04 = (reg04&~0xf000)|(_SHIFTL(sample_pattern[10][1],12,4));
-      reg04 = (reg04&~0xf0000)|(_SHIFTL(sample_pattern[11][0],16,4));
-      reg04 = (reg04&~0xf00000)|(_SHIFTL(sample_pattern[11][1],20,4));
-      reg04 = (reg04&~0xff000000)|(_SHIFTL(0x04,24,8));
-   }
-   else
-   {
-      reg01 = 0x01666666;
-      reg02 = 0x02666666;
-      reg03 = 0x03666666;
-      reg04 = 0x04666666;
-   }
-   GX_LOAD_BP_REG(reg01);
-   GX_LOAD_BP_REG(reg02);
-   GX_LOAD_BP_REG(reg03);
-   GX_LOAD_BP_REG(reg04);
-   reg53 = 0x53595000;
-   reg54 = 0x54000015;
-   if(vf) {
-      reg53 = 0x53000000|(vfilter[0]&0x3f);
-      reg53 = (reg53&~0xfc0)|(_SHIFTL(vfilter[1],6,6));
-      reg53 = (reg53&~0x3f000)|(_SHIFTL(vfilter[2],12,6));
-      reg53 = (reg53&~0xfc0000)|(_SHIFTL(vfilter[3],18,6));
-      reg54 = 0x54000000|(vfilter[4]&0x3f);
-      reg54 = (reg54&~0xfc0)|(_SHIFTL(vfilter[5],6,6));
-      reg54 = (reg54&~0x3f000)|(_SHIFTL(vfilter[6],12,6));
-   }
-   GX_LOAD_BP_REG(reg53);
-   GX_LOAD_BP_REG(reg54);
-}
-#endif
-
 #define __GX_Position1x8(index) FIFO_PUTU8(index)
 #define __GX_TexCoord1x8(index) FIFO_PUTU8(index)
 #define __GX_Color1x8(index) FIFO_PUTU8(index)

gx/ppc_asm.h

@@ -32,11 +32,11 @@
 
 #ifndef ppchalt
 #define ppchalt() ({					\
-	asm volatile("sync");				\
+      _sync(); \
 	while(1) {							\
-		asm volatile("nop");			\
+      _nop(); \
 		asm volatile("li 3,0");			\
-		asm volatile("nop");			\
+      _nop(); \
 	}									\
 })
 #endif