Re: [Mesa-dev] [PATCH v3 14/16] intel: devinfo: add simulator id

2018-06-22 Thread Rafael Antognolli 
Patches 14-16 are

Reviewed-by: Rafael Antognolli 

On Thu, Jun 21, 2018 at 05:29:13PM +0100, Lionel Landwerlin wrote:
> Signed-off-by: Lionel Landwerlin 
> ---
>  src/intel/dev/gen_device_info.c | 47 ++---
>  src/intel/dev/gen_device_info.h |  5 
>  2 files changed, 48 insertions(+), 4 deletions(-)
> 
> diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
> index 8e971329892..b0ae4d18034 100644
> --- a/src/intel/dev/gen_device_info.c
> +++ b/src/intel/dev/gen_device_info.c
> @@ -105,6 +105,7 @@ static const struct gen_device_info gen_device_info_i965 
> = {
>.size = 256,
> },
> .timestamp_frequency = 1250,
> +   .simulator_id = -1,
>  };
>  
>  static const struct gen_device_info gen_device_info_g4x = {
> @@ -124,6 +125,7 @@ static const struct gen_device_info gen_device_info_g4x = 
> {
>.size = 384,
> },
> .timestamp_frequency = 1250,
> +   .simulator_id = -1,
>  };
>  
>  static const struct gen_device_info gen_device_info_ilk = {
> @@ -142,6 +144,7 @@ static const struct gen_device_info gen_device_info_ilk = 
> {
>.size = 1024,
> },
> .timestamp_frequency = 1250,
> +   .simulator_id = -1,
>  };
>  
>  static const struct gen_device_info gen_device_info_snb_gt1 = {
> @@ -170,6 +173,7 @@ static const struct gen_device_info 
> gen_device_info_snb_gt1 = {
>},
> },
> .timestamp_frequency = 1250,
> +   .simulator_id = -1,
>  };
>  
>  static const struct gen_device_info gen_device_info_snb_gt2 = {
> @@ -198,6 +202,7 @@ static const struct gen_device_info 
> gen_device_info_snb_gt2 = {
>},
> },
> .timestamp_frequency = 1250,
> +   .simulator_id = -1,
>  };
>  
>  #define GEN7_FEATURES   \
> @@ -236,6 +241,7 @@ static const struct gen_device_info 
> gen_device_info_ivb_gt1 = {
>   [MESA_SHADER_GEOMETRY]  = 192,
>},
> },
> +   .simulator_id = 7,
>  };
>  
>  static const struct gen_device_info gen_device_info_ivb_gt2 = {
> @@ -265,6 +271,7 @@ static const struct gen_device_info 
> gen_device_info_ivb_gt2 = {
>   [MESA_SHADER_GEOMETRY]  = 320,
>},
> },
> +   .simulator_id = 7,
>  };
>  
>  static const struct gen_device_info gen_device_info_byt = {
> @@ -294,6 +301,7 @@ static const struct gen_device_info gen_device_info_byt = 
> {
>   [MESA_SHADER_GEOMETRY]  = 192,
>},
> },
> +   .simulator_id = 10,
>  };
>  
>  #define HSW_FEATURES \
> @@ -328,6 +336,7 @@ static const struct gen_device_info 
> gen_device_info_hsw_gt1 = {
>   [MESA_SHADER_GEOMETRY]  = 256,
>},
> },
> +   .simulator_id = 9,
>  };
>  
>  static const struct gen_device_info gen_device_info_hsw_gt2 = {
> @@ -356,6 +365,7 @@ static const struct gen_device_info 
> gen_device_info_hsw_gt2 = {
>   [MESA_SHADER_GEOMETRY]  = 640,
>},
> },
> +   .simulator_id = 9,
>  };
>  
>  static const struct gen_device_info gen_device_info_hsw_gt3 = {
> @@ -384,6 +394,7 @@ static const struct gen_device_info 
> gen_device_info_hsw_gt3 = {
>   [MESA_SHADER_GEOMETRY]  = 640,
>},
> },
> +   .simulator_id = 9,
>  };
>  
>  /* It's unclear how well supported sampling from the hiz buffer is on GEN8,
> @@ -429,7 +440,8 @@ static const struct gen_device_info 
> gen_device_info_bdw_gt1 = {
>   [MESA_SHADER_TESS_EVAL] = 1536,
>   [MESA_SHADER_GEOMETRY]  = 960,
>},
> -   }
> +   },
> +   .simulator_id = 11,
>  };
>  
>  static const struct gen_device_info gen_device_info_bdw_gt2 = {
> @@ -453,7 +465,8 @@ static const struct gen_device_info 
> gen_device_info_bdw_gt2 = {
>   [MESA_SHADER_TESS_EVAL] = 1536,
>   [MESA_SHADER_GEOMETRY]  = 960,
>},
> -   }
> +   },
> +   .simulator_id = 11,
>  };
>  
>  static const struct gen_device_info gen_device_info_bdw_gt3 = {
> @@ -477,7 +490,8 @@ static const struct gen_device_info 
> gen_device_info_bdw_gt3 = {
>   [MESA_SHADER_TESS_EVAL] = 1536,
>   [MESA_SHADER_GEOMETRY]  = 960,
>},
> -   }
> +   },
> +   .simulator_id = 11,
>  };
>  
>  static const struct gen_device_info gen_device_info_chv = {
> @@ -507,7 +521,8 @@ static const struct gen_device_info gen_device_info_chv = 
> {
>   [MESA_SHADER_TESS_EVAL] = 384,
>   [MESA_SHADER_GEOMETRY]  = 256,
>},
> -   }
> +   },
> +   .simulator_id = 13,
>  };
>  
>  #define GEN9_HW_INFO\
> @@ -603,6 +618,7 @@ static const struct gen_device_info 
> gen_device_info_skl_gt1 = {
> .num_eu_per_subslice = 6,
> .l3_banks = 2,
> .urb.size = 192,
> +   .simulator_id = 12,
>  };
>  
>  static const struct gen_device_info gen_device_info_skl_gt2 = {
> @@ -612,6 +628,7 @@ static const struct gen_device_info 
> gen_device_info_skl_gt2 = {
> .num_subslices = { 3, },
> .num_eu_per_subslice = 8,
> .l3_banks = 4,
> +   .simulator_id = 12,
>  };
>  
>

[Mesa-dev] [PATCH v3 14/16] intel: devinfo: add simulator id

2018-06-21 Thread Lionel Landwerlin 
Signed-off-by: Lionel Landwerlin 
---
 src/intel/dev/gen_device_info.c | 47 ++---
 src/intel/dev/gen_device_info.h |  5 
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 8e971329892..b0ae4d18034 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -105,6 +105,7 @@ static const struct gen_device_info gen_device_info_i965 = {
   .size = 256,
},
.timestamp_frequency = 1250,
+   .simulator_id = -1,
 };
 
 static const struct gen_device_info gen_device_info_g4x = {
@@ -124,6 +125,7 @@ static const struct gen_device_info gen_device_info_g4x = {
   .size = 384,
},
.timestamp_frequency = 1250,
+   .simulator_id = -1,
 };
 
 static const struct gen_device_info gen_device_info_ilk = {
@@ -142,6 +144,7 @@ static const struct gen_device_info gen_device_info_ilk = {
   .size = 1024,
},
.timestamp_frequency = 1250,
+   .simulator_id = -1,
 };
 
 static const struct gen_device_info gen_device_info_snb_gt1 = {
@@ -170,6 +173,7 @@ static const struct gen_device_info gen_device_info_snb_gt1 
= {
   },
},
.timestamp_frequency = 1250,
+   .simulator_id = -1,
 };
 
 static const struct gen_device_info gen_device_info_snb_gt2 = {
@@ -198,6 +202,7 @@ static const struct gen_device_info gen_device_info_snb_gt2 
= {
   },
},
.timestamp_frequency = 1250,
+   .simulator_id = -1,
 };
 
 #define GEN7_FEATURES   \
@@ -236,6 +241,7 @@ static const struct gen_device_info gen_device_info_ivb_gt1 
= {
  [MESA_SHADER_GEOMETRY]  = 192,
   },
},
+   .simulator_id = 7,
 };
 
 static const struct gen_device_info gen_device_info_ivb_gt2 = {
@@ -265,6 +271,7 @@ static const struct gen_device_info gen_device_info_ivb_gt2 
= {
  [MESA_SHADER_GEOMETRY]  = 320,
   },
},
+   .simulator_id = 7,
 };
 
 static const struct gen_device_info gen_device_info_byt = {
@@ -294,6 +301,7 @@ static const struct gen_device_info gen_device_info_byt = {
  [MESA_SHADER_GEOMETRY]  = 192,
   },
},
+   .simulator_id = 10,
 };
 
 #define HSW_FEATURES \
@@ -328,6 +336,7 @@ static const struct gen_device_info gen_device_info_hsw_gt1 
= {
  [MESA_SHADER_GEOMETRY]  = 256,
   },
},
+   .simulator_id = 9,
 };
 
 static const struct gen_device_info gen_device_info_hsw_gt2 = {
@@ -356,6 +365,7 @@ static const struct gen_device_info gen_device_info_hsw_gt2 
= {
  [MESA_SHADER_GEOMETRY]  = 640,
   },
},
+   .simulator_id = 9,
 };
 
 static const struct gen_device_info gen_device_info_hsw_gt3 = {
@@ -384,6 +394,7 @@ static const struct gen_device_info gen_device_info_hsw_gt3 
= {
  [MESA_SHADER_GEOMETRY]  = 640,
   },
},
+   .simulator_id = 9,
 };
 
 /* It's unclear how well supported sampling from the hiz buffer is on GEN8,
@@ -429,7 +440,8 @@ static const struct gen_device_info gen_device_info_bdw_gt1 
= {
  [MESA_SHADER_TESS_EVAL] = 1536,
  [MESA_SHADER_GEOMETRY]  = 960,
   },
-   }
+   },
+   .simulator_id = 11,
 };
 
 static const struct gen_device_info gen_device_info_bdw_gt2 = {
@@ -453,7 +465,8 @@ static const struct gen_device_info gen_device_info_bdw_gt2 
= {
  [MESA_SHADER_TESS_EVAL] = 1536,
  [MESA_SHADER_GEOMETRY]  = 960,
   },
-   }
+   },
+   .simulator_id = 11,
 };
 
 static const struct gen_device_info gen_device_info_bdw_gt3 = {
@@ -477,7 +490,8 @@ static const struct gen_device_info gen_device_info_bdw_gt3 
= {
  [MESA_SHADER_TESS_EVAL] = 1536,
  [MESA_SHADER_GEOMETRY]  = 960,
   },
-   }
+   },
+   .simulator_id = 11,
 };
 
 static const struct gen_device_info gen_device_info_chv = {
@@ -507,7 +521,8 @@ static const struct gen_device_info gen_device_info_chv = {
  [MESA_SHADER_TESS_EVAL] = 384,
  [MESA_SHADER_GEOMETRY]  = 256,
   },
-   }
+   },
+   .simulator_id = 13,
 };
 
 #define GEN9_HW_INFO\
@@ -603,6 +618,7 @@ static const struct gen_device_info gen_device_info_skl_gt1 
= {
.num_eu_per_subslice = 6,
.l3_banks = 2,
.urb.size = 192,
+   .simulator_id = 12,
 };
 
 static const struct gen_device_info gen_device_info_skl_gt2 = {
@@ -612,6 +628,7 @@ static const struct gen_device_info gen_device_info_skl_gt2 
= {
.num_subslices = { 3, },
.num_eu_per_subslice = 8,
.l3_banks = 4,
+   .simulator_id = 12,
 };
 
 static const struct gen_device_info gen_device_info_skl_gt3 = {
@@ -621,6 +638,7 @@ static const struct gen_device_info gen_device_info_skl_gt3 
= {
.num_subslices = { 3, 3, },
.num_eu_per_subslice = 8,
.l3_banks = 8,
+   .simulator_id = 12,
 };
 
 static const struct gen_device_info gen_device_info_skl_gt4 = {
@@ -639,18 +657,21 @@ static const struct gen_device_info 
gen_device_info_skl_gt4 = {
 * only 1008KB of this will be used."
 */