Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t] lib/gpgpu_shader: Fix compilation warning and write dword shader
@ 2024-08-14  9:58 Dominik Grzegorzek
  2024-08-14 11:29 ` Andrzej Hajda
  0 siblings, 1 reply; 3+ messages in thread
From: Dominik Grzegorzek @ 2024-08-14  9:58 UTC (permalink / raw)
  To: igt-dev; +Cc: Dominik Grzegorzek, Andrzej Hajda

1) Fix src1_null macro definiton to match platforms which are mentioned in
the comment above the declaration. (DG2+)

Fixes:
iga64 -Xauto-deps -Wall -p=12p71 lib/iga64_generated_codes.c.d/iga64_assembly_eot.12p71.asm
line 2.37: warning: Src1.Length should suffix src1 register (e.g. r10:4)
(W) send.gtwy (8|M0) null r112 null 0 0x02000000 {EOT}
                                    ^
2) Zero out r4 register in media block write message to prevent
   errors when the same register was used earlier in the shader.

Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
---
 lib/gpgpu_shader.c          |  4 ++--
 lib/iga64_generated_codes.c | 18 +++++++++++-------
 lib/iga64_macros.h          |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/gpgpu_shader.c b/lib/gpgpu_shader.c
index 991455c49..5cbb4346b 100644
--- a/lib/gpgpu_shader.c
+++ b/lib/gpgpu_shader.c
@@ -286,6 +286,8 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
 (W)	mov (1|M0)               r5.1<1>:ud    ARG(4):ud			\n\
 (W)	mov (1|M0)               r5.2<1>:ud    ARG(5):ud			\n\
 (W)	mov (1|M0)               r5.3<1>:ud    ARG(6):ud			\n\
+	// clear message header							\n\
+(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
 #if GEN_VER < 2000 // Media Block Write						\n\
 	// X offset of the block in bytes := (thread group id X << ARG(0))	\n\
 (W)	shl (1|M0)               r4.0<1>:ud    r0.1<0;1,0>:ud    ARG(0):ud	\n\
@@ -303,8 +305,6 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
 	// Load r2.4-7 with tg id Y + ARG(1):ud					\n\
 (W)	mov (1|M0)               r2.1<1>:ud    r0.6<0;1,0>:ud			\n\
 (W)	add (1|M0)               r2.1<1>:ud    r2.1<0;1,0>:ud    ARG(1):ud	\n\
-	// payload setup							\n\
-(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
 	// Store X and Y block start (160:191 and 192:223)			\n\
 (W)	mov (2|M0)               r4.5<1>:ud    r2.0<2;2,1>:ud			\n\
 	// Store X and Y block max_size (224:231 and 232:239)			\n\
diff --git a/lib/iga64_generated_codes.c b/lib/iga64_generated_codes.c
index 6a08c4844..1769f4ecf 100644
--- a/lib/iga64_generated_codes.c
+++ b/lib/iga64_generated_codes.c
@@ -3,7 +3,7 @@
 
 #include "gpgpu_shader.h"
 
-#define MD5_SUM_IGA64_ASMS 2c503cbfbd7b3043e9a52188ae4da7a8
+#define MD5_SUM_IGA64_ASMS cecee4a452aa9764b5eaebb60269f1a4
 
 struct iga64_template const iga64_code_media_block_write[] = {
 	{ .gen_ver = 2000, .size = 56, .code = (const uint32_t []) {
@@ -11,22 +11,23 @@ struct iga64_template const iga64_code_media_block_write[] = {
 		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
 		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
 		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
+		0x80100061, 0x04054220, 0x00000000, 0x00000000,
 		0x80000069, 0x02058220, 0x02000014, 0xc0ded000,
 		0x80000061, 0x02150220, 0x00000064, 0x00000000,
 		0x80001940, 0x02158220, 0x02000214, 0xc0ded001,
-		0x80100061, 0x04054220, 0x00000000, 0x00000000,
-		0x80041a61, 0x04550220, 0x00220205, 0x00000000,
+		0x80041961, 0x04550220, 0x00220205, 0x00000000,
 		0x80000061, 0x04754220, 0x00000000, 0xc0ded002,
 		0x80132031, 0x00000000, 0xd00e0494, 0x04000000,
 		0x80000001, 0x00010000, 0x20000000, 0x00000000,
 		0x80000001, 0x00010000, 0x30000000, 0x00000000,
 		0x80000901, 0x00010000, 0x00000000, 0x00000000,
 	}},
-	{ .gen_ver = 1270, .size = 56, .code = (const uint32_t []) {
+	{ .gen_ver = 1270, .size = 60, .code = (const uint32_t []) {
 		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
 		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
 		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
 		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
+		0x80040061, 0x04054220, 0x00000000, 0x00000000,
 		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
 		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
 		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
@@ -38,11 +39,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
 		0x80000001, 0x00010000, 0x30000000, 0x00000000,
 		0x80000901, 0x00010000, 0x00000000, 0x00000000,
 	}},
-	{ .gen_ver = 1260, .size = 52, .code = (const uint32_t []) {
+	{ .gen_ver = 1260, .size = 56, .code = (const uint32_t []) {
 		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
 		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
 		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
 		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
+		0x80100061, 0x04054220, 0x00000000, 0x00000000,
 		0x80000069, 0x04058220, 0x02000014, 0xc0ded000,
 		0x80000061, 0x04150220, 0x00000064, 0x00000000,
 		0x80001940, 0x04158220, 0x02000414, 0xc0ded001,
@@ -53,11 +55,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
 		0x80000001, 0x00010000, 0x30000000, 0x00000000,
 		0x80000901, 0x00010000, 0x00000000, 0x00000000,
 	}},
-	{ .gen_ver = 1250, .size = 56, .code = (const uint32_t []) {
+	{ .gen_ver = 1250, .size = 60, .code = (const uint32_t []) {
 		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
 		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
 		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
 		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
+		0x80040061, 0x04054220, 0x00000000, 0x00000000,
 		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
 		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
 		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
@@ -69,11 +72,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
 		0x80000001, 0x00010000, 0x30000000, 0x00000000,
 		0x80000901, 0x00010000, 0x00000000, 0x00000000,
 	}},
-	{ .gen_ver = 0, .size = 52, .code = (const uint32_t []) {
+	{ .gen_ver = 0, .size = 56, .code = (const uint32_t []) {
 		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
 		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
 		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
 		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
+		0x80040061, 0x04054220, 0x00000000, 0x00000000,
 		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
 		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
 		0x80000140, 0x04258220, 0x02000424, 0xc0ded001,
diff --git a/lib/iga64_macros.h b/lib/iga64_macros.h
index f4ef5cb16..03cc726d4 100644
--- a/lib/iga64_macros.h
+++ b/lib/iga64_macros.h
@@ -7,7 +7,7 @@
 #define IGA64_MACROS_H
 
 /* send instruction for DG2+ requires 0 length in case src1 is null, BSpec: 47443 */
-#if GEN_VER < 1271
+#if GEN_VER <= 1250
 #define src1_null null
 #else
 #define src1_null null:0
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH i-g-t] lib/gpgpu_shader: Fix compilation warning and write dword shader
  2024-08-14  9:58 [PATCH i-g-t] lib/gpgpu_shader: Fix compilation warning and write dword shader Dominik Grzegorzek
@ 2024-08-14 11:29 ` Andrzej Hajda
  2024-08-14 12:42   ` Grzegorzek, Dominik
  0 siblings, 1 reply; 3+ messages in thread
From: Andrzej Hajda @ 2024-08-14 11:29 UTC (permalink / raw)
  To: Dominik Grzegorzek, igt-dev



On 14.08.2024 11:58, Dominik Grzegorzek wrote:
> 1) Fix src1_null macro definiton to match platforms which are mentioned in
> the comment above the declaration. (DG2+)
>
> Fixes:
> iga64 -Xauto-deps -Wall -p=12p71 lib/iga64_generated_codes.c.d/iga64_assembly_eot.12p71.asm
> line 2.37: warning: Src1.Length should suffix src1 register (e.g. r10:4)
> (W) send.gtwy (8|M0) null r112 null 0 0x02000000 {EOT}
>                                      ^
> 2) Zero out r4 register in media block write message to prevent
>     errors when the same register was used earlier in the shader.
>
> Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>

Regards
Andrzej
> ---
>   lib/gpgpu_shader.c          |  4 ++--
>   lib/iga64_generated_codes.c | 18 +++++++++++-------
>   lib/iga64_macros.h          |  2 +-
>   3 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/lib/gpgpu_shader.c b/lib/gpgpu_shader.c
> index 991455c49..5cbb4346b 100644
> --- a/lib/gpgpu_shader.c
> +++ b/lib/gpgpu_shader.c
> @@ -286,6 +286,8 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
>   (W)	mov (1|M0)               r5.1<1>:ud    ARG(4):ud			\n\
>   (W)	mov (1|M0)               r5.2<1>:ud    ARG(5):ud			\n\
>   (W)	mov (1|M0)               r5.3<1>:ud    ARG(6):ud			\n\
> +	// clear message header							\n\
> +(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
>   #if GEN_VER < 2000 // Media Block Write						\n\
>   	// X offset of the block in bytes := (thread group id X << ARG(0))	\n\
>   (W)	shl (1|M0)               r4.0<1>:ud    r0.1<0;1,0>:ud    ARG(0):ud	\n\
> @@ -303,8 +305,6 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
>   	// Load r2.4-7 with tg id Y + ARG(1):ud					\n\
>   (W)	mov (1|M0)               r2.1<1>:ud    r0.6<0;1,0>:ud			\n\
>   (W)	add (1|M0)               r2.1<1>:ud    r2.1<0;1,0>:ud    ARG(1):ud	\n\
> -	// payload setup							\n\
> -(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
>   	// Store X and Y block start (160:191 and 192:223)			\n\
>   (W)	mov (2|M0)               r4.5<1>:ud    r2.0<2;2,1>:ud			\n\
>   	// Store X and Y block max_size (224:231 and 232:239)			\n\
> diff --git a/lib/iga64_generated_codes.c b/lib/iga64_generated_codes.c
> index 6a08c4844..1769f4ecf 100644
> --- a/lib/iga64_generated_codes.c
> +++ b/lib/iga64_generated_codes.c
> @@ -3,7 +3,7 @@
>   
>   #include "gpgpu_shader.h"
>   
> -#define MD5_SUM_IGA64_ASMS 2c503cbfbd7b3043e9a52188ae4da7a8
> +#define MD5_SUM_IGA64_ASMS cecee4a452aa9764b5eaebb60269f1a4
>   
>   struct iga64_template const iga64_code_media_block_write[] = {
>   	{ .gen_ver = 2000, .size = 56, .code = (const uint32_t []) {
> @@ -11,22 +11,23 @@ struct iga64_template const iga64_code_media_block_write[] = {
>   		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
>   		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
>   		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
> +		0x80100061, 0x04054220, 0x00000000, 0x00000000,
>   		0x80000069, 0x02058220, 0x02000014, 0xc0ded000,
>   		0x80000061, 0x02150220, 0x00000064, 0x00000000,
>   		0x80001940, 0x02158220, 0x02000214, 0xc0ded001,
> -		0x80100061, 0x04054220, 0x00000000, 0x00000000,
> -		0x80041a61, 0x04550220, 0x00220205, 0x00000000,
> +		0x80041961, 0x04550220, 0x00220205, 0x00000000,
>   		0x80000061, 0x04754220, 0x00000000, 0xc0ded002,
>   		0x80132031, 0x00000000, 0xd00e0494, 0x04000000,
>   		0x80000001, 0x00010000, 0x20000000, 0x00000000,
>   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
>   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
>   	}},
> -	{ .gen_ver = 1270, .size = 56, .code = (const uint32_t []) {
> +	{ .gen_ver = 1270, .size = 60, .code = (const uint32_t []) {
>   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
>   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
>   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
>   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
>   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
>   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
>   		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
> @@ -38,11 +39,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
>   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
>   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
>   	}},
> -	{ .gen_ver = 1260, .size = 52, .code = (const uint32_t []) {
> +	{ .gen_ver = 1260, .size = 56, .code = (const uint32_t []) {
>   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
>   		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
>   		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
>   		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
> +		0x80100061, 0x04054220, 0x00000000, 0x00000000,
>   		0x80000069, 0x04058220, 0x02000014, 0xc0ded000,
>   		0x80000061, 0x04150220, 0x00000064, 0x00000000,
>   		0x80001940, 0x04158220, 0x02000414, 0xc0ded001,
> @@ -53,11 +55,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
>   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
>   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
>   	}},
> -	{ .gen_ver = 1250, .size = 56, .code = (const uint32_t []) {
> +	{ .gen_ver = 1250, .size = 60, .code = (const uint32_t []) {
>   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
>   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
>   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
>   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
>   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
>   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
>   		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
> @@ -69,11 +72,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
>   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
>   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
>   	}},
> -	{ .gen_ver = 0, .size = 52, .code = (const uint32_t []) {
> +	{ .gen_ver = 0, .size = 56, .code = (const uint32_t []) {
>   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
>   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
>   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
>   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
>   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
>   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
>   		0x80000140, 0x04258220, 0x02000424, 0xc0ded001,
> diff --git a/lib/iga64_macros.h b/lib/iga64_macros.h
> index f4ef5cb16..03cc726d4 100644
> --- a/lib/iga64_macros.h
> +++ b/lib/iga64_macros.h
> @@ -7,7 +7,7 @@
>   #define IGA64_MACROS_H
>   
>   /* send instruction for DG2+ requires 0 length in case src1 is null, BSpec: 47443 */
> -#if GEN_VER < 1271
> +#if GEN_VER <= 1250
>   #define src1_null null
>   #else
>   #define src1_null null:0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH i-g-t] lib/gpgpu_shader: Fix compilation warning and write dword shader
  2024-08-14 11:29 ` Andrzej Hajda
@ 2024-08-14 12:42   ` Grzegorzek, Dominik
  0 siblings, 0 replies; 3+ messages in thread
From: Grzegorzek, Dominik @ 2024-08-14 12:42 UTC (permalink / raw)
  To: igt-dev@lists.freedesktop.org, Hajda, Andrzej

On Wed, 2024-08-14 at 13:29 +0200, Andrzej Hajda wrote:
> 
> On 14.08.2024 11:58, Dominik Grzegorzek wrote:
> > 1) Fix src1_null macro definiton to match platforms which are mentioned in
> > the comment above the declaration. (DG2+)
> > 
> > Fixes:
> > iga64 -Xauto-deps -Wall -p=12p71 lib/iga64_generated_codes.c.d/iga64_assembly_eot.12p71.asm
> > line 2.37: warning: Src1.Length should suffix src1 register (e.g. r10:4)
> > (W) send.gtwy (8|M0) null r112 null 0 0x02000000 {EOT}
> >                                      ^
> > 2) Zero out r4 register in media block write message to prevent
> >     errors when the same register was used earlier in the shader.
> > 
> > Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
> > Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> 
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> 
> Regards
> Andrzej
> > ---
> >   lib/gpgpu_shader.c          |  4 ++--
> >   lib/iga64_generated_codes.c | 18 +++++++++++-------
> >   lib/iga64_macros.h          |  2 +-
> >   3 files changed, 14 insertions(+), 10 deletions(-)
> > 
> > diff --git a/lib/gpgpu_shader.c b/lib/gpgpu_shader.c
> > index 991455c49..5cbb4346b 100644
> > --- a/lib/gpgpu_shader.c
> > +++ b/lib/gpgpu_shader.c
> > @@ -286,6 +286,8 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
> >   (W)	mov (1|M0)               r5.1<1>:ud    ARG(4):ud			\n\
> >   (W)	mov (1|M0)               r5.2<1>:ud    ARG(5):ud			\n\
> >   (W)	mov (1|M0)               r5.3<1>:ud    ARG(6):ud			\n\
> > +	// clear message header							\n\
> > +(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
I just realized that, I'm clearing here already filled r5 register on platforms that have 256 long
GRFs :) It should go 4 lines up. 

I will send v2, I will keep rb. Let's wait for the premerge results for v2.

Regards,
Dominik
> >   #if GEN_VER < 2000 // Media Block Write						\n\
> >   	// X offset of the block in bytes := (thread group id X << ARG(0))	\n\
> >   (W)	shl (1|M0)               r4.0<1>:ud    r0.1<0;1,0>:ud    ARG(0):ud	\n\
> > @@ -303,8 +305,6 @@ void gpgpu_shader__write_dword(struct gpgpu_shader *shdr, uint32_t value,
> >   	// Load r2.4-7 with tg id Y + ARG(1):ud					\n\
> >   (W)	mov (1|M0)               r2.1<1>:ud    r0.6<0;1,0>:ud			\n\
> >   (W)	add (1|M0)               r2.1<1>:ud    r2.1<0;1,0>:ud    ARG(1):ud	\n\
> > -	// payload setup							\n\
> > -(W)	mov (16|M0)              r4.0<1>:ud    0x0:ud				\n\
> >   	// Store X and Y block start (160:191 and 192:223)			\n\
> >   (W)	mov (2|M0)               r4.5<1>:ud    r2.0<2;2,1>:ud			\n\
> >   	// Store X and Y block max_size (224:231 and 232:239)			\n\
> > diff --git a/lib/iga64_generated_codes.c b/lib/iga64_generated_codes.c
> > index 6a08c4844..1769f4ecf 100644
> > --- a/lib/iga64_generated_codes.c
> > +++ b/lib/iga64_generated_codes.c
> > @@ -3,7 +3,7 @@
> >   
> >   #include "gpgpu_shader.h"
> >   
> > -#define MD5_SUM_IGA64_ASMS 2c503cbfbd7b3043e9a52188ae4da7a8
> > +#define MD5_SUM_IGA64_ASMS cecee4a452aa9764b5eaebb60269f1a4
> >   
> >   struct iga64_template const iga64_code_media_block_write[] = {
> >   	{ .gen_ver = 2000, .size = 56, .code = (const uint32_t []) {
> > @@ -11,22 +11,23 @@ struct iga64_template const iga64_code_media_block_write[] = {
> >   		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
> >   		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
> >   		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
> > +		0x80100061, 0x04054220, 0x00000000, 0x00000000,
> >   		0x80000069, 0x02058220, 0x02000014, 0xc0ded000,
> >   		0x80000061, 0x02150220, 0x00000064, 0x00000000,
> >   		0x80001940, 0x02158220, 0x02000214, 0xc0ded001,
> > -		0x80100061, 0x04054220, 0x00000000, 0x00000000,
> > -		0x80041a61, 0x04550220, 0x00220205, 0x00000000,
> > +		0x80041961, 0x04550220, 0x00220205, 0x00000000,
> >   		0x80000061, 0x04754220, 0x00000000, 0xc0ded002,
> >   		0x80132031, 0x00000000, 0xd00e0494, 0x04000000,
> >   		0x80000001, 0x00010000, 0x20000000, 0x00000000,
> >   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
> >   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
> >   	}},
> > -	{ .gen_ver = 1270, .size = 56, .code = (const uint32_t []) {
> > +	{ .gen_ver = 1270, .size = 60, .code = (const uint32_t []) {
> >   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
> >   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
> >   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
> >   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> > +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
> >   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
> >   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
> >   		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
> > @@ -38,11 +39,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
> >   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
> >   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
> >   	}},
> > -	{ .gen_ver = 1260, .size = 52, .code = (const uint32_t []) {
> > +	{ .gen_ver = 1260, .size = 56, .code = (const uint32_t []) {
> >   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
> >   		0x80000061, 0x05154220, 0x00000000, 0xc0ded004,
> >   		0x80000061, 0x05254220, 0x00000000, 0xc0ded005,
> >   		0x80000061, 0x05354220, 0x00000000, 0xc0ded006,
> > +		0x80100061, 0x04054220, 0x00000000, 0x00000000,
> >   		0x80000069, 0x04058220, 0x02000014, 0xc0ded000,
> >   		0x80000061, 0x04150220, 0x00000064, 0x00000000,
> >   		0x80001940, 0x04158220, 0x02000414, 0xc0ded001,
> > @@ -53,11 +55,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
> >   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
> >   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
> >   	}},
> > -	{ .gen_ver = 1250, .size = 56, .code = (const uint32_t []) {
> > +	{ .gen_ver = 1250, .size = 60, .code = (const uint32_t []) {
> >   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
> >   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
> >   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
> >   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> > +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
> >   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
> >   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
> >   		0x80001940, 0x04258220, 0x02000424, 0xc0ded001,
> > @@ -69,11 +72,12 @@ struct iga64_template const iga64_code_media_block_write[] = {
> >   		0x80000001, 0x00010000, 0x30000000, 0x00000000,
> >   		0x80000901, 0x00010000, 0x00000000, 0x00000000,
> >   	}},
> > -	{ .gen_ver = 0, .size = 52, .code = (const uint32_t []) {
> > +	{ .gen_ver = 0, .size = 56, .code = (const uint32_t []) {
> >   		0x80000061, 0x05054220, 0x00000000, 0xc0ded003,
> >   		0x80000061, 0x05254220, 0x00000000, 0xc0ded004,
> >   		0x80000061, 0x05454220, 0x00000000, 0xc0ded005,
> >   		0x80000061, 0x05654220, 0x00000000, 0xc0ded006,
> > +		0x80040061, 0x04054220, 0x00000000, 0x00000000,
> >   		0x80000069, 0x04058220, 0x02000024, 0xc0ded000,
> >   		0x80000061, 0x04250220, 0x000000c4, 0x00000000,
> >   		0x80000140, 0x04258220, 0x02000424, 0xc0ded001,
> > diff --git a/lib/iga64_macros.h b/lib/iga64_macros.h
> > index f4ef5cb16..03cc726d4 100644
> > --- a/lib/iga64_macros.h
> > +++ b/lib/iga64_macros.h
> > @@ -7,7 +7,7 @@
> >   #define IGA64_MACROS_H
> >   
> >   /* send instruction for DG2+ requires 0 length in case src1 is null, BSpec: 47443 */
> > -#if GEN_VER < 1271
> > +#if GEN_VER <= 1250
> >   #define src1_null null
> >   #else
> >   #define src1_null null:0
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-08-14 12:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-14  9:58 [PATCH i-g-t] lib/gpgpu_shader: Fix compilation warning and write dword shader Dominik Grzegorzek
2024-08-14 11:29 ` Andrzej Hajda
2024-08-14 12:42   ` Grzegorzek, Dominik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox