sna/brw: Fix EU tests to select the right gen

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

4 files changed, 19 insertions, 15 deletions

diff --git a/src/sna/brw/brw_test_gen4.c b/src/sna/brw/brw_test_gen4.c
index 742c7c24..c0a185f3 100644
--- a/src/sna/brw/brw_test_gen4.c
+++ b/src/sna/brw/brw_test_gen4.c
@@ -127,6 +127,8 @@ static const uint32_t ps_kernel_planar_static[][4] = {
 #include "exa_wm_write.g4b"
 };
 
+#define GEN 040
+
 #define compare(old) brw_test_compare(__FUNCTION__, p.gen, p.store, p.nr_insn, (struct brw_instruction *)old, ARRAY_SIZE(old)-8)
 
 static void gen4_sf__nomask(void)
@@ -134,7 +136,7 @@ static void gen4_sf__nomask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 40, store);
+	brw_compile_init(&p, GEN, store);
 	brw_sf_kernel__nomask(&p);
 
 	compare(sf_kernel);
@@ -145,7 +147,7 @@ static void gen4_sf__mask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 40, store);
+	brw_compile_init(&p, GEN, store);
 	brw_sf_kernel__mask(&p);
 
 	compare(sf_kernel_mask);
@@ -157,7 +159,7 @@ gen4_wm_kernel__affine_nomask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 40, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__affine(&p, 16);
 
 	compare(ps_kernel_nomask_affine);
@@ -169,7 +171,7 @@ gen4_wm_kernel__affine_mask_noca(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 40, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__affine_mask(&p, 16);
 
 	compare(ps_kernel_masknoca_affine);
@@ -181,7 +183,7 @@ gen4_wm_kernel__projective_nomask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 40, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__projective(&p, 16);
 
 	compare(ps_kernel_nomask_projective);
diff --git a/src/sna/brw/brw_test_gen5.c b/src/sna/brw/brw_test_gen5.c
index 62a999e1..5f909fe5 100644
--- a/src/sna/brw/brw_test_gen5.c
+++ b/src/sna/brw/brw_test_gen5.c
@@ -129,12 +129,14 @@ static const uint32_t ps_kernel_planar_static[][4] = {
 
 #define compare(old) brw_test_compare(__FUNCTION__, p.gen, p.store, p.nr_insn, (struct brw_instruction *)old, ARRAY_SIZE(old))
 
+#define GEN 050
+
 static void gen5_sf(void)
 {
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_sf_kernel__nomask(&p);
 
 	compare(sf_kernel);
@@ -145,7 +147,7 @@ static void gen5_sf_mask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_sf_kernel__mask(&p);
 
 	compare(sf_kernel_mask);
@@ -156,7 +158,7 @@ static void gen5_wm_affine_nomask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__affine(&p, 16);
 
 	compare(ps_kernel_nomask_affine);
@@ -167,7 +169,7 @@ static void gen5_wm_affine_mask_noca(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__affine_mask(&p, 16);
 
 	compare(ps_kernel_masknoca_affine);
@@ -178,7 +180,7 @@ static void gen5_wm_affine_mask_ca(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__affine_mask_ca(&p, 16);
 
 	compare(ps_kernel_maskca_affine);
@@ -189,7 +191,7 @@ static void gen5_wm_projective_nomask(void)
 	uint32_t store[128];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 50, store);
+	brw_compile_init(&p, GEN, store);
 	brw_wm_kernel__projective(&p, 16);
 
 	compare(ps_kernel_nomask_projective);
diff --git a/src/sna/brw/brw_test_gen6.c b/src/sna/brw/brw_test_gen6.c
index 64bc2fb1..813ea8ac 100644
--- a/src/sna/brw/brw_test_gen6.c
+++ b/src/sna/brw/brw_test_gen6.c
@@ -172,7 +172,7 @@ static void gen6_ps_nomask_affine(void)
 	uint32_t store[1024];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 60, store);
+	brw_compile_init(&p, 060, store);
 	brw_wm_kernel__affine(&p, 16);
 
 	compare(ps_kernel_nomask_affine);
@@ -183,7 +183,7 @@ static void gen6_ps_mask_affine(void)
 	uint32_t store[1024];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 60, store);
+	brw_compile_init(&p, 060, store);
 	brw_wm_kernel__affine_mask(&p, 16);
 
 	compare(ps_kernel_masknoca_affine);
@@ -194,7 +194,7 @@ static void gen6_ps_nomask_projective(void)
 	uint32_t store[1024];
 	struct brw_compile p;
 
-	brw_compile_init(&p, 60, store);
+	brw_compile_init(&p, 060, store);
 	brw_wm_kernel__projective(&p, 16);
 
 	compare(ps_kernel_nomask_projective);
diff --git a/src/sna/brw/brw_test_gen7.c b/src/sna/brw/brw_test_gen7.c
index 085b25cc..297ae470 100644
--- a/src/sna/brw/brw_test_gen7.c
+++ b/src/sna/brw/brw_test_gen7.c
@@ -110,7 +110,7 @@ static const uint32_t ps_kernel_planar[][4] = {
 };
 
 #define compare(old) brw_test_compare(__FUNCTION__, p.gen, p.store, p.nr_insn, (struct brw_instruction *)old, ARRAY_SIZE(old))
-#define GEN 70
+#define GEN 070
 
 static void gen7_ps_nomask_affine(void)
 {