[Autobackout][FuncReg]Revert of change: 89e6a4b

 Force alignment 1 for every element of packed struct

The packed struct is definied by align 1. In our code the first buffer was created with the correct byte-size, but then the re-alignment took place to align struct's members.
The second alignment that took place didn't remember about packed-struct align 1, so this PR forces it.

Author: kcyganik1

IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantAnalysis.cpp

@@ -412,22 +412,10 @@ void ProgramScopeConstantAnalysis::addData(Constant* initializer,
     DataVector& inlineProgramScopeBuffer,
     PointerOffsetInfoList& pointerOffsetInfoList,
     BufferOffsetMap& inlineProgramScopeOffsets,
-    unsigned addressSpace,
-    bool forceAlignmentOne)
+    unsigned addressSpace)
 {
     // Initial alignment padding before insert the current constant into the buffer.
-    alignment_t typeAlignment = m_DL->getABITypeAlignment(initializer->getType());
-    if (forceAlignmentOne)
-        typeAlignment = 1;
-    alignBuffer(inlineProgramScopeBuffer, typeAlignment);
-
-    // If the initializer is packed struct make sure, that every variable inside
-    // will have also align 1
-    if (StructType* s = dyn_cast<StructType>(initializer->getType()))
-    {
-        if (cast<StructType>(s)->isPacked())
-            forceAlignmentOne = true;
-    }
+    alignBuffer(inlineProgramScopeBuffer, m_DL->getABITypeAlignment(initializer->getType()));
 
     // We need to do extra work with pointers here: we don't know their actual addresses
     // at compile time so we find the offset from the base of the buffer they point to
@@ -613,7 +601,7 @@ void ProgramScopeConstantAnalysis::addData(Constant* initializer,
             Constant* C = initializer->getAggregateElement(i);
             IGC_ASSERT_MESSAGE(C, "getAggregateElement returned null, unsupported constant");
             // Since the type may not be primitive, extra alignment is required.
-            addData(C, inlineProgramScopeBuffer, pointerOffsetInfoList, inlineProgramScopeOffsets, addressSpace, forceAlignmentOne);
+            addData(C, inlineProgramScopeBuffer, pointerOffsetInfoList, inlineProgramScopeOffsets, addressSpace);
         }
     }
     // And, finally, we have to handle base types - ints and floats.
@@ -644,5 +632,5 @@ void ProgramScopeConstantAnalysis::addData(Constant* initializer,
 
     // final padding.  This gets used by the vec3 types that will insert zero padding at the
     // end after inserting the actual vector contents (this is due to sizeof(vec3) == 4 * sizeof(scalarType)).
-    alignBuffer(inlineProgramScopeBuffer, typeAlignment);
+    alignBuffer(inlineProgramScopeBuffer, m_DL->getABITypeAlignment(initializer->getType()));
 }

IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantAnalysis.hpp

@@ -81,8 +81,7 @@ namespace IGC
             DataVector& inlineConstantBuffer,
             PointerOffsetInfoList& pointerOffsetInfo,
             BufferOffsetMap& inlineProgramScopeOffsets,
-            unsigned addressSpace,
-            bool forceAlignmentOne=false);
+            unsigned addressSpace);
 
         /// @brief  Align the buffer according to the required alignment
         /// @param  buffer     The buffer to align.