[Beignet] [PATCH] GBE: Fix an assert on bitcast long to char8

[Zhigang Gong]

LGTM, will push latter. Thanks.

On Mon, Jun 09, 2014 at 04:14:29PM +0800, Ruiling Song wrote:
> Signed-off-by: Ruiling Song <ruiling.song at intel.com>
> ---
>  backend/src/backend/gen_insn_selection.cpp |   27 +++++++++++++++------------
>  1 file changed, 15 insertions(+), 12 deletions(-)
> 
> diff --git a/backend/src/backend/gen_insn_selection.cpp b/backend/src/backend/gen_insn_selection.cpp
> index 3530d2c..0a550d2 100644
> --- a/backend/src/backend/gen_insn_selection.cpp
> +++ b/backend/src/backend/gen_insn_selection.cpp
> @@ -3090,15 +3090,26 @@ namespace gbe
>            wideReg = sel.selReg(insn.getDst(index/multiple), narrowType);
>            narrowReg = sel.selReg(insn.getSrc(i), narrowType);  //retype to narrow type
>          }
> +
> +        // set correct horizontal stride
>          if(wideReg.hstride != GEN_HORIZONTAL_STRIDE_0) {
>            if(multiple == 2) {
>              wideReg = sel.unpacked_uw(wideReg.reg());
>              wideReg = GenRegister::retype(wideReg, getGenType(narrowType));
> +            if(isInt64)
> +              wideReg.hstride = GEN_HORIZONTAL_STRIDE_1;
>            } else if(multiple == 4) {
>              wideReg = sel.unpacked_ub(wideReg.reg());
>              wideReg = GenRegister::retype(wideReg, getGenType(narrowType));
> -          } else if(multiple == 8) {  //need to specail handle long to char
> -            GBE_ASSERT(multiple == 8);
> +            if(isInt64)
> +              wideReg.hstride = GEN_HORIZONTAL_STRIDE_2;
> +          } else if(multiple == 8) {
> +            // we currently store high/low 32bit separately in register,
> +            // so, its hstride is 4 here.
> +            wideReg = sel.unpacked_ub(wideReg.reg());
> +            wideReg = GenRegister::retype(wideReg, getGenType(narrowType));
> +          } else {
> +            GBE_ASSERT(0);
>            }
>          }
>  
> @@ -3107,19 +3118,11 @@ namespace gbe
>            wideReg.subphysical = 1;
>          }
>          if(isInt64) {
> -          if(wideReg.hstride != GEN_HORIZONTAL_STRIDE_0) {
> -            // as we store long by bottom & high part separately, we have to divide hstride by 2
> -            if (wideReg.hstride == GEN_HORIZONTAL_STRIDE_2)
> -              wideReg.hstride = GEN_HORIZONTAL_STRIDE_1;
> -            else if (wideReg.hstride == GEN_HORIZONTAL_STRIDE_4)
> -              wideReg.hstride = GEN_HORIZONTAL_STRIDE_2;
> -            else
> -              GBE_ASSERT(0);
> -          }
> -          // offset to next half
>            wideReg.subphysical = 1;
> +          // Offset to next half
>            if(i >= multiple/2)
>              wideReg = GenRegister::offset(wideReg, 0, sel.isScalarReg(wideReg.reg()) ? 4 : simdWidth*4);
> +          // Offset to desired narrow element in wideReg
>            if(index % (multiple/2))
>              wideReg = GenRegister::offset(wideReg, 0, (index % (multiple/2)) * typeSize(wideReg.type));
>          }
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet