[xiph-commits] r14345 - in trunk: theora/lib/dec/x86 theora-exp/lib/x86

tterribe at svn.xiph.org tterribe at svn.xiph.org
Fri Jan 4 10:02:23 PST 2008


Author: tterribe
Date: 2008-01-04 10:02:21 -0800 (Fri, 04 Jan 2008)
New Revision: 14345

Modified:
   trunk/theora-exp/lib/x86/mmxfrag.c
   trunk/theora/lib/dec/x86/mmxfrag.c
Log:
Fix position of comments.


Modified: trunk/theora/lib/dec/x86/mmxfrag.c
===================================================================
--- trunk/theora/lib/dec/x86/mmxfrag.c	2008-01-04 18:00:14 UTC (rev 14344)
+++ trunk/theora/lib/dec/x86/mmxfrag.c	2008-01-04 18:02:21 UTC (rev 14345)
@@ -204,78 +204,78 @@
   __asm__ __volatile__("pxor %%mm7,%%mm7\n\t"::);
   for(i=4;i-->0;){
     __asm__ __volatile__(
+      /*#0 Load src1.*/
       "movq (%[src1]),%%mm0\n\t"
-      /*#0 Load src1.*/
+      /*#0 Load src2.*/
       "movq (%[src2]),%%mm2\n\t"
-      /*#0 Load src2.*/
+      /*#0 Copy src1.*/
       "movq %%mm0,%%mm1\n\t"
-      /*#0 Copy src1.*/
+      /*#0 Copy src2.*/
       "movq %%mm2,%%mm3\n\t"
-      /*#0 Copy src2.*/
+      /*#1 Load src1.*/
       "movq (%[src1],%[ystride]),%%mm4\n\t"
-      /*#1 Load src1.*/
+      /*#0 Unpack lower src1.*/
       "punpcklbw %%mm7,%%mm0\n\t"
-      /*#0 Unpack lower src1.*/
+      /*#1 Load src2.*/
       "movq (%[src2],%[ystride]),%%mm5\n\t"
-      /*#1 Load src2.*/
+      /*#0 Unpack higher src1.*/
       "punpckhbw %%mm7,%%mm1\n\t"
-      /*#0 Unpack higher src1.*/
+      /*#0 Unpack lower src2.*/
       "punpcklbw %%mm7,%%mm2\n\t"
-      /*#0 Unpack lower src2.*/
+      /*#0 Unpack higher src2.*/
       "punpckhbw %%mm7,%%mm3\n\t"
-      /*#0 Unpack higher src2.*/
+      /*Advance src1 ptr.*/
       "lea (%[src1],%[ystride],2),%[src1]\n\t"
-      /*Advance src1 ptr.*/
+      /*Advance src2 ptr.*/
       "lea (%[src2],%[ystride],2),%[src2]\n\t"
-      /*Advance src2 ptr.*/
+      /*#0 Lower src1+src2.*/
       "paddsw %%mm2,%%mm0\n\t"
-      /*#0 Lower src1+src2.*/
+      /*#0 Higher src1+src2.*/
       "paddsw %%mm3,%%mm1\n\t"
-      /*#0 Higher src1+src2.*/
+      /*#1 Copy src1.*/
       "movq %%mm4,%%mm2\n\t"
-      /*#1 Copy src1.*/
+      /*#0 Build lo average.*/
       "psraw $1,%%mm0\n\t"
-      /*#0 Build lo average.*/
+      /*#1 Copy src2.*/
       "movq %%mm5,%%mm3\n\t"
-      /*#1 Copy src2.*/
+      /*#1 Unpack lower src1.*/
       "punpcklbw %%mm7,%%mm4\n\t"
-      /*#1 Unpack lower src1.*/
+      /*#0 Build hi average.*/
       "psraw $1,%%mm1\n\t"
-      /*#0 Build hi average.*/
+      /*#1 Unpack higher src1.*/
       "punpckhbw %%mm7,%%mm2\n\t"
-      /*#1 Unpack higher src1.*/
+      /*#0 low+=residue.*/
       "paddsw (%[residue]),%%mm0\n\t"
-      /*#0 low+=residue.*/
+      /*#1 Unpack lower src2.*/
       "punpcklbw %%mm7,%%mm5\n\t"
-      /*#1 Unpack lower src2.*/
+      /*#0 high+=residue.*/
       "paddsw 8(%[residue]),%%mm1\n\t"
-      /*#0 high+=residue.*/
+      /*#1 Unpack higher src2.*/
       "punpckhbw %%mm7,%%mm3\n\t"
-      /*#1 Unpack higher src2.*/
+      /*#1 Lower src1+src2.*/
       "paddsw %%mm4,%%mm5\n\t"
-      /*#1 Lower src1+src2.*/
+      /*#0 Pack and saturate.*/
       "packuswb %%mm1,%%mm0\n\t"
-      /*#0 Pack and saturate.*/
+      /*#1 Higher src1+src2.*/
       "paddsw %%mm2,%%mm3\n\t"
-      /*#1 Higher src1+src2.*/
+      /*#0 Write row.*/
       "movq %%mm0,(%[dst])\n\t"
-      /*#0 Write row.*/
+      /*#1 Build lo average.*/
       "psraw $1,%%mm5\n\t"
-      /*#1 Build lo average.*/
+      /*#1 Build hi average.*/
       "psraw $1,%%mm3\n\t"
-      /*#1 Build hi average.*/
+      /*#1 low+=residue.*/
       "paddsw 16(%[residue]),%%mm5\n\t"
-      /*#1 low+=residue.*/
+      /*#1 high+=residue.*/
       "paddsw 24(%[residue]),%%mm3\n\t"
-      /*#1 high+=residue.*/
+      /*#1 Pack and saturate.*/
       "packuswb  %%mm3,%%mm5\n\t"
-      /*#1 Pack and saturate.*/
+      /*#1 Write row ptr.*/
       "movq %%mm5,(%[dst],%[ystride])\n\t"
-      /*#1 Write row ptr.*/
+      /*Advance residue ptr.*/
       "add $32,%[residue]\n\t"
-      /*Advance residue ptr.*/
+      /*Advance dest ptr.*/
       "lea (%[dst],%[ystride],2),%[dst]\n\t"
-      /*Advance dest ptr.*/
      :[dst]"+r"(_dst),[residue]"+r"(_residue),
       [src1]"+r"(_src1),[src2]"+r"(_src2)
      :[ystride]"r"((long)_dst_ystride)

Modified: trunk/theora-exp/lib/x86/mmxfrag.c
===================================================================
--- trunk/theora-exp/lib/x86/mmxfrag.c	2008-01-04 18:00:14 UTC (rev 14344)
+++ trunk/theora-exp/lib/x86/mmxfrag.c	2008-01-04 18:02:21 UTC (rev 14345)
@@ -199,78 +199,78 @@
   __asm__ __volatile__("pxor %%mm7,%%mm7\n\t"::);
   for(i=4;i-->0;){
     __asm__ __volatile__(
+      /*#0 Load src1.*/
       "movq (%[src1]),%%mm0\n\t"
-      /*#0 Load src1.*/
+      /*#0 Load src2.*/
       "movq (%[src2]),%%mm2\n\t"
-      /*#0 Load src2.*/
+      /*#0 Copy src1.*/
       "movq %%mm0,%%mm1\n\t"
-      /*#0 Copy src1.*/
+      /*#0 Copy src2.*/
       "movq %%mm2,%%mm3\n\t"
-      /*#0 Copy src2.*/
+      /*#1 Load src1.*/
       "movq (%[src1],%[ystride]),%%mm4\n\t"
-      /*#1 Load src1.*/
+      /*#0 Unpack lower src1.*/
       "punpcklbw %%mm7,%%mm0\n\t"
-      /*#0 Unpack lower src1.*/
+      /*#1 Load src2.*/
       "movq (%[src2],%[ystride]),%%mm5\n\t"
-      /*#1 Load src2.*/
+      /*#0 Unpack higher src1.*/
       "punpckhbw %%mm7,%%mm1\n\t"
-      /*#0 Unpack higher src1.*/
+      /*#0 Unpack lower src2.*/
       "punpcklbw %%mm7,%%mm2\n\t"
-      /*#0 Unpack lower src2.*/
+      /*#0 Unpack higher src2.*/
       "punpckhbw %%mm7,%%mm3\n\t"
-      /*#0 Unpack higher src2.*/
+      /*Advance src1 ptr.*/
       "lea (%[src1],%[ystride],2),%[src1]\n\t"
-      /*Advance src1 ptr.*/
+      /*Advance src2 ptr.*/
       "lea (%[src2],%[ystride],2),%[src2]\n\t"
-      /*Advance src2 ptr.*/
+      /*#0 Lower src1+src2.*/
       "paddsw %%mm2,%%mm0\n\t"
-      /*#0 Lower src1+src2.*/
+      /*#0 Higher src1+src2.*/
       "paddsw %%mm3,%%mm1\n\t"
-      /*#0 Higher src1+src2.*/
+      /*#1 Copy src1.*/
       "movq %%mm4,%%mm2\n\t"
-      /*#1 Copy src1.*/
+      /*#0 Build lo average.*/
       "psraw $1,%%mm0\n\t"
-      /*#0 Build lo average.*/
+      /*#1 Copy src2.*/
       "movq %%mm5,%%mm3\n\t"
-      /*#1 Copy src2.*/
+      /*#1 Unpack lower src1.*/
       "punpcklbw %%mm7,%%mm4\n\t"
-      /*#1 Unpack lower src1.*/
+      /*#0 Build hi average.*/
       "psraw $1,%%mm1\n\t"
-      /*#0 Build hi average.*/
+      /*#1 Unpack higher src1.*/
       "punpckhbw %%mm7,%%mm2\n\t"
-      /*#1 Unpack higher src1.*/
+      /*#0 low+=residue.*/
       "paddsw (%[residue]),%%mm0\n\t"
-      /*#0 low+=residue.*/
+      /*#1 Unpack lower src2.*/
       "punpcklbw %%mm7,%%mm5\n\t"
-      /*#1 Unpack lower src2.*/
+      /*#0 high+=residue.*/
       "paddsw 8(%[residue]),%%mm1\n\t"
-      /*#0 high+=residue.*/
+      /*#1 Unpack higher src2.*/
       "punpckhbw %%mm7,%%mm3\n\t"
-      /*#1 Unpack higher src2.*/
+      /*#1 Lower src1+src2.*/
       "paddsw %%mm4,%%mm5\n\t"
-      /*#1 Lower src1+src2.*/
+      /*#0 Pack and saturate.*/
       "packuswb %%mm1,%%mm0\n\t"
-      /*#0 Pack and saturate.*/
+      /*#1 Higher src1+src2.*/
       "paddsw %%mm2,%%mm3\n\t"
-      /*#1 Higher src1+src2.*/
+      /*#0 Write row.*/
       "movq %%mm0,(%[dst])\n\t"
-      /*#0 Write row.*/
+      /*#1 Build lo average.*/
       "psraw $1,%%mm5\n\t"
-      /*#1 Build lo average.*/
+      /*#1 Build hi average.*/
       "psraw $1,%%mm3\n\t"
-      /*#1 Build hi average.*/
+      /*#1 low+=residue.*/
       "paddsw 16(%[residue]),%%mm5\n\t"
-      /*#1 low+=residue.*/
+      /*#1 high+=residue.*/
       "paddsw 24(%[residue]),%%mm3\n\t"
-      /*#1 high+=residue.*/
+      /*#1 Pack and saturate.*/
       "packuswb  %%mm3,%%mm5\n\t"
-      /*#1 Pack and saturate.*/
+      /*#1 Write row ptr.*/
       "movq %%mm5,(%[dst],%[ystride])\n\t"
-      /*#1 Write row ptr.*/
+      /*Advance residue ptr.*/
       "add $32,%[residue]\n\t"
-      /*Advance residue ptr.*/
+      /*Advance dest ptr.*/
       "lea (%[dst],%[ystride],2),%[dst]\n\t"
-      /*Advance dest ptr.*/
      :[dst]"+r"(_dst),[residue]"+r"(_residue),
       [src1]"+r"(_src1),[src2]"+r"(_src2)
      :[ystride]"r"((long)_dst_ystride)



More information about the commits mailing list