- merged some Debian patches

[packages/beignet.git] / beignet-clearer-type-errors.patch

diff --git a/beignet-clearer-type-errors.patch b/beignet-clearer-type-errors.patch
new file mode 100644 (file)
index 0000000..09fc534
--- /dev/null
+++ b/beignet-clearer-type-errors.patch
@@ -0,0 +1,118 @@
+Description: More user-friendly "type not supported" errors
+
+(It would be even better if these returned build failure
+rather than asserting, but that's not as easy)
+     
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Forwarded: https://lists.freedesktop.org/archives/beignet/2017-September/009169.html
+
+--- a/backend/src/backend/gen_insn_selection.cpp
++++ b/backend/src/backend/gen_insn_selection.cpp
+@@ -5253,7 +5253,7 @@ extern bool OCL_DEBUGINFO; // first defi
+           write64Stateless(sel, address, src);
+         sel.pop();
+       } else {
+-        GBE_ASSERT(sel.hasLongType());
++        GBE_ASSERTM(sel.hasLongType(), "Long (int64) not supported on this device");
+         write64Stateless(sel, address, src);
+       }
+     }
+@@ -5838,7 +5838,7 @@ extern bool OCL_DEBUGINFO; // first defi
+ 
+         /* The special case, when dst is half, float->word->half will lose accuracy. */
+         if (dstType == TYPE_HALF) {
+-          GBE_ASSERT(sel.hasHalfType());
++          GBE_ASSERTM(sel.hasHalfType(), "Half precision not supported on this device");
+           type = GEN_TYPE_HF;
+         }
+ 
+@@ -5879,7 +5879,7 @@ extern bool OCL_DEBUGINFO; // first defi
+ 
+       if (dstType == TYPE_HALF) {
+         /* There is no MOV for Long <---> Half. So Long-->Float-->half. */
+-        GBE_ASSERT(sel.hasLongType());
++        GBE_ASSERTM(sel.hasLongType(), "Long (int64) not supported on this device");
+         GBE_ASSERT(sel.hasHalfType());
+         sel.push();
+         if (sel.isScalarReg(insn.getSrc(0))) {
+@@ -6181,7 +6181,7 @@ extern bool OCL_DEBUGINFO; // first defi
+         }
+       } else if (srcType == ir::TYPE_HALF) {
+         /* No need to consider old platform. if we support half, we must have native long. */
+-        GBE_ASSERT(sel.hasLongType());
++        GBE_ASSERTM(sel.hasLongType(), "Long (int64) not supported on this device");
+         GBE_ASSERT(sel.hasHalfType());
+         uint32_t type = dstType == TYPE_U64 ? GEN_TYPE_UD : GEN_TYPE_D;
+         GenRegister tmp = GenRegister::retype(sel.selReg(sel.reg(FAMILY_DWORD, sel.isScalarReg(insn.getSrc(0))), TYPE_U32), type);
+@@ -6205,7 +6205,7 @@ extern bool OCL_DEBUGINFO; // first defi
+           sel.MOV(dst, tmp);
+         }
+       } else if (src.type == GEN_TYPE_DF) {
+-        GBE_ASSERT(sel.hasDoubleType());
++        GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device");
+         GBE_ASSERT(sel.hasLongType()); //So far, if we support double, we support native long.
+ 
+         // Just Mov
+@@ -6224,7 +6224,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       const GenRegister dst = sel.selReg(insn.getDst(0), dstType);
+       const GenRegister src = sel.selReg(insn.getSrc(0), srcType);
+ 
+-      GBE_ASSERT(sel.hasDoubleType());
++      GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device (if this is a literal, use '1.0f' not '1.0')");
+ 
+       if (sel.isScalarReg(insn.getDst(0))) {
+         // dst is scalar, just MOV and nothing more.
+@@ -6263,7 +6263,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       const GenRegister dst = sel.selReg(insn.getDst(0), dstType);
+       const GenRegister src = sel.selReg(insn.getSrc(0), srcType);
+ 
+-      GBE_ASSERT(sel.hasDoubleType());
++      GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device (if this is a literal, use '1.0f' not '1.0')");
+       GBE_ASSERT(sel.hasHalfType()); //So far, if we support double, we support half.
+ 
+       if (sel.isScalarReg(insn.getDst(0))) { // uniform case.
+@@ -6329,7 +6329,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       // Special case, half -> char/short.
+       /* [DevBDW+]:   Format conversion to or from HF (Half Float) must be DWord-aligned and
+          strided by a DWord on the destination. */
+-      GBE_ASSERT(sel.hasHalfType());
++      GBE_ASSERTM(sel.hasHalfType(), "Half precision not supported on this device");
+       GenRegister tmp;
+       sel.push();
+       if (sel.isScalarReg(insn.getSrc(0))) {
+@@ -6361,7 +6361,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       // Special case, char/uchar -> half
+       /* [DevBDW+]:  Format conversion to or from HF (Half Float) must be DWord-aligned and
+          strided by a DWord on the destination. */
+-      GBE_ASSERT(sel.hasHalfType());
++      GBE_ASSERTM(sel.hasHalfType(), "Half precision not supported on this device");
+       GenRegister tmp = GenRegister::retype(sel.unpacked_uw(sel.reg(FAMILY_DWORD, sel.isScalarReg(insn.getSrc(0)))), GEN_TYPE_HF);
+       sel.push();
+       if (sel.isScalarReg(insn.getSrc(0))) {
+@@ -6383,7 +6383,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       const GenRegister src = sel.selReg(insn.getSrc(0), srcType);
+       const RegisterFamily dstFamily = getFamily(dstType);
+ 
+-      GBE_ASSERT(sel.hasDoubleType());
++      GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device (if this is a literal, use '1.0f' not '1.0')");
+       GBE_ASSERT(sel.hasHalfType()); //So far, if we support double, we support half.
+       if (sel.isScalarReg(insn.getDst(0))) {
+         // dst is scalar, just MOV and nothing more.
+@@ -6427,7 +6427,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       const GenRegister dst = sel.selReg(insn.getDst(0), dstType);
+       const GenRegister src = sel.selReg(insn.getSrc(0), srcType);
+ 
+-      GBE_ASSERT(sel.hasDoubleType());
++      GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device");
+       GBE_ASSERT(sel.hasLongType()); //So far, if we support double, we support native long.
+       // Just Mov
+       sel.MOV(dst, src);
+@@ -6442,7 +6442,7 @@ extern bool OCL_DEBUGINFO; // first defi
+       const GenRegister src = sel.selReg(insn.getSrc(0), srcType);
+       const RegisterFamily srcFamily = getFamily(srcType);
+ 
+-      GBE_ASSERT(sel.hasDoubleType());
++      GBE_ASSERTM(sel.hasDoubleType(), "Double precision not supported on this device");
+       GBE_ASSERT(sel.hasLongType()); //So far, if we support double, we support native long.
+ 
+       if (sel.hasLongType() && sel.hasLongRegRestrict()) {