No functional change for FOSS.

The only non-obvious FOSS visible changes are:
* additional dummy filed in patch token struct 
  (SPatchExecutionEnvironment), (file patch_shared.h)
* increment of const CURRENT_ICBE_VERSION, (patch_list.h)

Change-Id: I38a1460995698efa551dadd7e90d46fcd7443854

Author: piotrgkurek

IGC/AdaptorOCL/ocl_igc_shared/executable_format/patch_list.h

@@ -34,7 +34,7 @@ Abstract:   Contains common patch structure definitions
 namespace iOpenCL
 {
 
-const uint32_t CURRENT_ICBE_VERSION = 1059;
+const uint32_t CURRENT_ICBE_VERSION = 1060;
 
 const uint32_t MAGIC_CL = 0x494E5443;      // 'I', 'N', 'T', 'C'
 const uint32_t INVALID_INDEX = 0xFFFFFFFF;

IGC/AdaptorOCL/ocl_igc_shared/executable_format/patch_shared.h

@@ -209,10 +209,11 @@ struct SPatchExecutionEnvironment :
     uint32_t    WorkgroupWalkOrderDims; // dim0 : [0 : 1]; dim1 : [2 : 3]; dim2 : [4 : 5]
     uint32_t    HasGlobalAtomics;
     uint32_t    reserved;
+    uint32_t    reserved2;
 };
 
 // Update CURRENT_ICBE_VERSION when modifying the patch list
-static_assert(sizeof(SPatchExecutionEnvironment) == (96 + sizeof(SPatchItemHeader)), "The size of SPatchExecutionEnvironment is not what is expected");
+static_assert(sizeof(SPatchExecutionEnvironment) == (100 + sizeof(SPatchItemHeader)), "The size of SPatchExecutionEnvironment is not what is expected");
 
 /*****************************************************************************\
 STRUCT: SPatchString

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -483,37 +483,37 @@ namespace IGC
     assert(m_encoderState.m_flag.var == nullptr && "predicate not supported");
     VISA_StateOpndHandle* pSurfStateOpndHandle = GetVISASurfaceOpnd(resource);
         VISA_PredOpnd* predOpnd = GetFlagOperand(m_encoderState.m_flag);
-    VISA_RawOpnd* pDst = GetRawDestination(dst);
-    VISA_RawOpnd* pElemOffset = GetRawSource(elem_offset);
-    VISA_RawOpnd* pSrc0 = GetRawSource(src0);
-    VISA_RawOpnd* pSrc1 = GetRawSource(src1);
-
-    /*
-    So the problem is this - the message was added for SNB, and at the time it was implemented as
-    CMPXCHG : new = (old==src1) ? src0 : old
-
-    In IVB this becomes untyped atomic, and it's implemented as
-    AOP_CMPWR (src0 == old_dst) ? src1 : old_dst old_dst
-
-    Note that the source is swapped.  Since we define CMPXCHG as the former in vISA, internally we
-    perform a swap for it.  So I guess for now you'll need to swap the two source to follow the vISA
-    semantics.  We may want to add a new vISA message to fix this issue.
-    */
-    if (atomic_op == EATOMIC_CMPXCHG) {
-        std::swap(pSrc0, pSrc1);
-    }
+        VISA_RawOpnd* pDst = GetRawDestination(dst);
+        VISA_RawOpnd* pElemOffset = GetRawSource(elem_offset);
+        VISA_RawOpnd* pSrc0 = GetRawSource(src0);
+        VISA_RawOpnd* pSrc1 = GetRawSource(src1);
 
-    V(vKernel->AppendVISASurfAccessDwordAtomicInst(
-        predOpnd,
-        convertAtomicOpEnumToVisa(atomic_op),
-        is16Bit,
-        ConvertMaskToVisaType(m_encoderState.m_mask, m_encoderState.m_noMask),
-        visaExecSize(m_encoderState.m_simdSize),
-        pSurfStateOpndHandle,
-        pElemOffset,
-        pSrc0,
-        pSrc1,
-        pDst));
+        /*
+        So the problem is this - the message was added for SNB, and at the time it was implemented as
+        CMPXCHG : new = (old==src1) ? src0 : old
+
+        In IVB this becomes untyped atomic, and it's implemented as
+        AOP_CMPWR (src0 == old_dst) ? src1 : old_dst old_dst
+
+        Note that the source is swapped.  Since we define CMPXCHG as the former in vISA, internally we
+        perform a swap for it.  So I guess for now you'll need to swap the two source to follow the vISA
+        semantics.  We may want to add a new vISA message to fix this issue.
+        */
+        if (atomic_op == EATOMIC_CMPXCHG) {
+            std::swap(pSrc0, pSrc1);
+        }
+
+        V(vKernel->AppendVISASurfAccessDwordAtomicInst(
+            predOpnd,
+            convertAtomicOpEnumToVisa(atomic_op),
+            is16Bit,
+            ConvertMaskToVisaType(m_encoderState.m_mask, m_encoderState.m_noMask),
+            visaExecSize(m_encoderState.m_simdSize),
+            pSurfStateOpndHandle,
+            pElemOffset,
+            pSrc0,
+            pSrc1,
+            pDst));
     }
 
     void CEncoder::Cmp(e_predicate p, CVariable* dst, CVariable* src0, CVariable* src1)