Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit dd8cade

Browse files
xhaihaoxhaihao
committed
Use generic register instead of acc0 to calculate the Y/U/V or R/G/B offset
The instruction 'mov' cannot assign acc0 with :v anymore on CNL, so all AVS shaders doesn't work as expected. Replacing acc0 with GRF registers works well on CNL and it works on GEN8/GEN9 too. v2: update code style Signed-off-by: Xiang, Haihao <[email protected]>
1 parent 5d7d525 commit dd8cade

27 files changed

+165
-165
lines changed

‎src/shaders/post_processing/gen8/Save_AVS_RGBX.g8a

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@
392392
//Internal LAYOUT:(RRGGBBAA)
393393
//Assign buffer channel order for Buffer 0123 in the order RGBA a0.3>A, a0.2>B, a0.1>G, a0.0>R
394394
// R = 0, G= 4, B = 8, A = 12.
395-
mov (4) acc0.0<1>:w 0x62EA:v
396-
add (4) acc0.0<1>:w acc0<4;4,1>:w 70:uw
397-
shl (4) r22.0<1>:w acc0<4;4,1>:w 5:uw
395+
mov (4) r22.0<1>:w 0x62EA:v
396+
add (4) r22.0<1>:w r22.0<4;4,1>:w 70:uw
397+
shl (4) r22.0<1>:w r22.0<4;4,1>:w 5:uw
398398

399399
// if channel swap?
400400
// This means that it should be BGRA(B is the LSB) or RGBA

‎src/shaders/post_processing/gen8/Set_AVS_Buf_0123_BGRA.g8a

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,18 @@
349349
// V = 8, Y= 0, U = 4, A = 12.
350350
// And a0.x is used as indirect-register for RGBX. R=a0.1, G=a0.2, B=a0.0
351351
// B = 8, R= 0, G = 4, A = 12
352-
mov (4) acc0.0<1>:w 0x6EA2:v
353-
add (4) acc0.0<1>:w acc0<4;4,1>:w 70:uw
354-
shl (4) r22.0<1>:w acc0<4;4,1>:w 5:uw
352+
mov (4) r22.0<1>:w 0x6EA2:v
353+
add (4) r22.0<1>:w r22.0<4;4,1>:w 70:uw
354+
shl (4) r22.0<1>:w r22.0<4;4,1>:w 5:uw
355355

356356
//OPT: wAVS_SU_SHUFFLE_PTR_0 and udAVS_SU_SHUFFLE_OFF_0 are sub-regs of same GRF. -rT
357357

358358
//SU LAYOUT:(VYUAVYUA)
359359
//V = 4, Y = 2, U = 0, A = 6
360360
//B = 4, G = 2, R = 0, A = 6
361-
mov (4) acc0.0<1>:w 0x6204:v
362-
add (4) acc0.0<1>:w acc0<4;4,1>:w 64:uw
363-
shl (4) r18.0<1>:w acc0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
361+
mov (4) r18.0<1>:w 0x6204:v
362+
add (4) r18.0<1>:w r18.0<4;4,1>:w 64:uw
363+
shl (4) r18.0<1>:w r18.0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
364364

365365
//OFFSET:
366366
mov (1) r18.4<1>:ud 0x1000100:ud { NoDDChk }

‎src/shaders/post_processing/gen8/Set_AVS_Buf_0123_PL2.g8a

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,16 @@
344344
//AVS LAYOUT: (YYUUVVAA)
345345
//Assign buffer channel order for Buffer 0123 in the order AUYV a0.3>A, a0.2>U, a0.1>Y, a0.0>V
346346
//For PL2-AVS: V = 8, Y= 0, U = 4, A = 12.
347-
mov (4) acc0.0<1>:w 0x6EA2:v //Subtract 6 from 0,4,8,12
348-
add (4) acc0.0<1>:w acc0<4;4,1>:w 70:uw //add 6 back
349-
shl (4) r22.0<1>:w acc0<4;4,1>:w 5:uw //Convert to BYTE address.
347+
mov (4) r22.0<1>:w 0x6EA2:v //Subtract 6 from 0,4,8,12
348+
add (4) r22.0<1>:w r22.0<4;4,1>:w 70:uw //add 6 back
349+
shl (4) r22.0<1>:w r22.0<4;4,1>:w 5:uw //Convert to BYTE address.
350350

351351
//OPT: wAVS_SU_SHUFFLE_PTR_0 and udAVS_SU_SHUFFLE_OFF_0 are sub-regs of same GRF. -rT
352352
//SU LAYOUT:(YUVAYUVA)
353353
//V = 4, Y = 0, U = 2, A = 6
354-
mov (4) acc0.0<1>:w 0x6204:v
355-
add (4) acc0.0<1>:w acc0<4;4,1>:w 64:uw
356-
shl (4) r18.0<1>:w acc0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
354+
mov (4) r18.0<1>:w 0x6204:v
355+
add (4) r18.0<1>:w r18.0<4;4,1>:w 64:uw
356+
shl (4) r18.0<1>:w r18.0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
357357

358358
//OFFSET:
359359
mov (1) r18.4<1>:ud 0x1000100:ud { NoDDChk }

‎src/shaders/post_processing/gen8/Set_AVS_Buf_0123_PL3.g8a

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,17 +344,17 @@
344344
//AVS LAYOUT: (YYUUVVAA)
345345
//Assign buffer channel order for Buffer 0123 in the order AUYV a0.3>A, a0.2>U, a0.1>Y, a0.0>V
346346
//For PL3-AVS: V = 8, Y= 0, U = 4, A = 12.
347-
mov (4) acc0.0<1>:w 0x6EA2:v
347+
mov (4) r22.0<1>:w 0x6EA2:v
348348
//Subtract 6 from 0,4,8,12
349-
add (4) acc0.0<1>:w acc0<4;4,1>:w 70:uw //add 6 back
350-
shl (4) r22.0<1>:w acc0<4;4,1>:w 5:uw //Convert to BYTE address.
349+
add (4) r22.0<1>:w r22.0<4;4,1>:w 70:uw //add 6 back
350+
shl (4) r22.0<1>:w r22.0<4;4,1>:w 5:uw //Convert to BYTE address.
351351

352352
//OPT: wAVS_SU_SHUFFLE_PTR_0 and udAVS_SU_SHUFFLE_OFF_0 are sub-regs of same GRF. -rT
353353
//SU LAYOUT:(YUVAYUVA)
354354
//V = 4, Y = 0, U = 2, A = 6
355-
mov (4) acc0.0<1>:w 0x6204:v
356-
add (4) acc0.0<1>:w acc0<4;4,1>:w 64:uw
357-
shl (4) r18.0<1>:w acc0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
355+
mov (4) r18.0<1>:w 0x6204:v
356+
add (4) r18.0<1>:w r18.0<4;4,1>:w 64:uw
357+
shl (4) r18.0<1>:w r18.0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
358358

359359
//OFFSET:
360360
mov (1) r18.4<1>:ud 0x1000100:ud { NoDDChk }

‎src/shaders/post_processing/gen8/Set_AVS_Buf_0123_VYUA.g8a

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,17 +348,17 @@
348348
//Cr is returned on R-channel. 0
349349
//Y is returned on G channel. 4
350350
//Cb is returned on B channel. 8
351-
mov (4) acc0.0<1>:w 0x62EA:v //Subtract 6 from 0,4,8,12
352-
add (4) acc0.0<1>:w acc0<4;4,1>:w 70:uw //add 6 back
353-
shl (4) r22.0<1>:w acc0<4;4,1>:w 5:uw //Convert to BYTE address.
351+
mov (4) r22.0<1>:w 0x62EA:v //Subtract 6 from 0,4,8,12
352+
add (4) r22.0<1>:w r22.0<4;4,1>:w 70:uw //add 6 back
353+
shl (4) r22.0<1>:w r22.0<4;4,1>:w 5:uw //Convert to BYTE address.
354354

355355
//OPT: wAVS_SU_SHUFFLE_PTR_0 and udAVS_SU_SHUFFLE_OFF_0 are sub-regs of same GRF. -rT
356356

357357
//SU LAYOUT:(VYUAVYUA)
358358
//V = 0, Y = 2, U = 4, A = 6
359-
mov (4) acc0.0<1>:w 0x6420:v
360-
add (4) acc0.0<1>:w acc0<4;4,1>:w 64:uw
361-
shl (4) r18.0<1>:w acc0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
359+
mov (4) r18.0<1>:w 0x6420:v
360+
add (4) r18.0<1>:w r18.0<4;4,1>:w 64:uw
361+
shl (4) r18.0<1>:w r18.0<4;4,1>:w 5:uw { NoDDClr } //Convert to BYTE address.
362362

363363
//OFFSET:
364364
mov (1) r18.4<1>:ud 0x1000100:ud { NoDDChk }

‎src/shaders/post_processing/gen8/pa_to_pa.g8b

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
{ 0x00000648, 0x22f03ae8, 0x3e000134, 0x41000000 },
6363
{ 0x00000401, 0x22f40608, 0x00000000, 0x00000000 },
6464
{ 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
65-
{ 0x00400001, 0x24003660, 0x30000000, 0x000062ea },
66-
{ 0x00400040, 0x24001860, 0x16690400, 0x00460046 },
67-
{ 0x00400009, 0x22c01868, 0x16690400, 0x00050005 },
68-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006420 },
69-
{ 0x00400040, 0x24001860, 0x16690400, 0x00400040 },
70-
{ 0x00400209, 0x22401868, 0x16690400, 0x00050005 },
65+
{ 0x00400001, 0x22c03668, 0x30000000, 0x000062ea },
66+
{ 0x00400040, 0x22c01a68, 0x166902c0, 0x00460046 },
67+
{ 0x00400009, 0x22c01a68, 0x166902c0, 0x00050005 },
68+
{ 0x00400001, 0x22403668, 0x30000000, 0x00006420 },
69+
{ 0x00400040, 0x22401a68, 0x16690240, 0x00400040 },
70+
{ 0x00400209, 0x22401a68, 0x16690240, 0x00050005 },
7171
{ 0x00000401, 0x22500608, 0x00000000, 0x01000100 },
7272
{ 0x00000001, 0x22d00608, 0x00000000, 0x00400040 },
7373
{ 0x00000001, 0x220c0208, 0x0000000c, 0x00000000 },

‎src/shaders/post_processing/gen8/pa_to_pl2.g8b

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
{ 0x00000648, 0x22f03ae8, 0x3e000134, 0x41000000 },
6363
{ 0x00000401, 0x22f40608, 0x00000000, 0x00000000 },
6464
{ 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
65-
{ 0x00400001, 0x24003660, 0x30000000, 0x000062ea },
66-
{ 0x00400040, 0x24001860, 0x16690400, 0x00460046 },
67-
{ 0x00400009, 0x22c01868, 0x16690400, 0x00050005 },
68-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006420 },
69-
{ 0x00400040, 0x24001860, 0x16690400, 0x00400040 },
70-
{ 0x00400209, 0x22401868, 0x16690400, 0x00050005 },
65+
{ 0x00400001, 0x22c03668, 0x30000000, 0x000062ea },
66+
{ 0x00400040, 0x22c01a68, 0x166902c0, 0x00460046 },
67+
{ 0x00400009, 0x22c01a68, 0x166902c0, 0x00050005 },
68+
{ 0x00400001, 0x22403668, 0x30000000, 0x00006420 },
69+
{ 0x00400040, 0x22401a68, 0x16690240, 0x00400040 },
70+
{ 0x00400209, 0x22401a68, 0x16690240, 0x00050005 },
7171
{ 0x00000401, 0x22500608, 0x00000000, 0x01000100 },
7272
{ 0x00000001, 0x22d00608, 0x00000000, 0x00400040 },
7373
{ 0x00000001, 0x220c0208, 0x0000000c, 0x00000000 },

‎src/shaders/post_processing/gen8/pa_to_pl3.g8b

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
{ 0x00000648, 0x22f03ae8, 0x3e000134, 0x41000000 },
6363
{ 0x00000401, 0x22f40608, 0x00000000, 0x00000000 },
6464
{ 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
65-
{ 0x00400001, 0x24003660, 0x30000000, 0x000062ea },
66-
{ 0x00400040, 0x24001860, 0x16690400, 0x00460046 },
67-
{ 0x00400009, 0x22c01868, 0x16690400, 0x00050005 },
68-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006420 },
69-
{ 0x00400040, 0x24001860, 0x16690400, 0x00400040 },
70-
{ 0x00400209, 0x22401868, 0x16690400, 0x00050005 },
65+
{ 0x00400001, 0x22c03668, 0x30000000, 0x000062ea },
66+
{ 0x00400040, 0x22c01a68, 0x166902c0, 0x00460046 },
67+
{ 0x00400009, 0x22c01a68, 0x166902c0, 0x00050005 },
68+
{ 0x00400001, 0x22403668, 0x30000000, 0x00006420 },
69+
{ 0x00400040, 0x22401a68, 0x16690240, 0x00400040 },
70+
{ 0x00400209, 0x22401a68, 0x16690240, 0x00050005 },
7171
{ 0x00000401, 0x22500608, 0x00000000, 0x01000100 },
7272
{ 0x00000001, 0x22d00608, 0x00000000, 0x00400040 },
7373
{ 0x00000001, 0x220c0208, 0x0000000c, 0x00000000 },

‎src/shaders/post_processing/gen8/pl2_to_pa.g8b

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
{ 0x00000648, 0x22f03ae8, 0x3e000134, 0x41000000 },
6363
{ 0x00000401, 0x22f40608, 0x00000000, 0x00000000 },
6464
{ 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
65-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006ea2 },
66-
{ 0x00400040, 0x24001860, 0x16690400, 0x00460046 },
67-
{ 0x00400009, 0x22c01868, 0x16690400, 0x00050005 },
68-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006204 },
69-
{ 0x00400040, 0x24001860, 0x16690400, 0x00400040 },
70-
{ 0x00400209, 0x22401868, 0x16690400, 0x00050005 },
65+
{ 0x00400001, 0x22c03668, 0x30000000, 0x00006ea2 },
66+
{ 0x00400040, 0x22c01a68, 0x166902c0, 0x00460046 },
67+
{ 0x00400009, 0x22c01a68, 0x166902c0, 0x00050005 },
68+
{ 0x00400001, 0x22403668, 0x30000000, 0x00006204 },
69+
{ 0x00400040, 0x22401a68, 0x16690240, 0x00400040 },
70+
{ 0x00400209, 0x22401a68, 0x16690240, 0x00050005 },
7171
{ 0x00000401, 0x22500608, 0x00000000, 0x01000100 },
7272
{ 0x00000001, 0x22d00608, 0x00000000, 0x00400040 },
7373
{ 0x00000001, 0x220c0208, 0x0000000c, 0x00000000 },

‎src/shaders/post_processing/gen8/pl2_to_pl2.g8b

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
{ 0x00000648, 0x22f03ae8, 0x3e000134, 0x41000000 },
6363
{ 0x00000401, 0x22f40608, 0x00000000, 0x00000000 },
6464
{ 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
65-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006ea2 },
66-
{ 0x00400040, 0x24001860, 0x16690400, 0x00460046 },
67-
{ 0x00400009, 0x22c01868, 0x16690400, 0x00050005 },
68-
{ 0x00400001, 0x24003660, 0x30000000, 0x00006204 },
69-
{ 0x00400040, 0x24001860, 0x16690400, 0x00400040 },
70-
{ 0x00400209, 0x22401868, 0x16690400, 0x00050005 },
65+
{ 0x00400001, 0x22c03668, 0x30000000, 0x00006ea2 },
66+
{ 0x00400040, 0x22c01a68, 0x166902c0, 0x00460046 },
67+
{ 0x00400009, 0x22c01a68, 0x166902c0, 0x00050005 },
68+
{ 0x00400001, 0x22403668, 0x30000000, 0x00006204 },
69+
{ 0x00400040, 0x22401a68, 0x16690240, 0x00400040 },
70+
{ 0x00400209, 0x22401a68, 0x16690240, 0x00050005 },
7171
{ 0x00000401, 0x22500608, 0x00000000, 0x01000100 },
7272
{ 0x02000005, 0x20001240, 0x16000046, 0x00020002 },
7373
{ 0x00110020, 0x34000004, 0x0e001400, 0x000002a0 },

0 commit comments

Comments
 (0)