Revert IGA,vISA: Clean-up gcc warnings

Clean-up gcc warnings, such as
-Werror=misleading-indentation
-Werror=catch-value
-Werror=class-memaccess
-Werror=unused-variable
-Werror=unused-but-set-variable

Author: DianaChen

visa/BinaryEncodingCNL.cpp

@@ -978,7 +978,6 @@ inline void BinaryEncodingCNL::EncodeTwoSrcInst(
   twoSrc.GetOperandControls().SetSrc0Regfile(
       TranslateVisaToHDLRegFile(EncodingHelper::GetSrcRegFile(src0)));
 
-  [[maybe_unused]]
   bool src0ImmOk = inst->isMath() && inst->asMathInst()->isOneSrcMath();
   vISA_ASSERT(src0ImmOk || !src0->isImm(),
                "src0 is immediate in two src instruction!");

visa/BinaryEncodingIGA.cpp

@@ -335,8 +335,8 @@ class BinaryEncodingIGA {
   static MathFC getMathFC(const G4_INST *inst);
   Type getIGAType(const G4_INST *I, Gen4_Operand_Number O, TARGET_PLATFORM P);
 
-  void *m_kernelBuffer = nullptr;
-  uint32_t m_kernelBufferSize = 0;
+  void *m_kernelBuffer;
+  uint32_t m_kernelBufferSize;
 }; // class BinaryEncodingIGA
 
 Platform
@@ -384,7 +384,8 @@ BinaryEncodingIGA::getIGAInternalPlatform(TARGET_PLATFORM genxPlatform) {
 }
 
 BinaryEncodingIGA::BinaryEncodingIGA(vISA::G4_Kernel &k, const std::string& fname)
-    : kernel(k), fileName(fname), platform(k.fg.builder->getPlatform()) {
+    : kernel(k), fileName(fname), m_kernelBuffer(nullptr),
+      m_kernelBufferSize(0), platform(k.fg.builder->getPlatform()) {
   platformModel = Model::LookupModel(getIGAInternalPlatform(platform));
   IGAKernel = new Kernel(*platformModel);
 }
@@ -1024,7 +1025,7 @@ void BinaryEncodingIGA::getIGAFlagInfo(G4_INST *inst, const OpSpec *opSpec,
   G4_Predicate *predG4 = inst->getPredicate();
   G4_CondMod *condModG4 = inst->getCondMod();
   RegRef predFlag;
-  [[maybe_unused]] bool hasPredFlag = false;
+  bool hasPredFlag = false;
 
   if (opSpec->supportsPredication() && predG4 != nullptr) {
     pred = getIGAPredication(predG4, inst->getExecSize(), *kernel.fg.builder);
@@ -1976,7 +1977,6 @@ Predication BinaryEncodingIGA::getIGAPredication(const G4_Predicate *predG4,
   // Xe_PVC+ has removed predCtrl width. Only .any, .all and .seq (default) are
   // supported. Try to translate PredCtrl values to compatible ones on Xe_PVC+
   // Return true on success, false on fail
-  [[maybe_unused]]
   auto translatePredCtrl = [&](G4_Predicate_Control &predCtrl) {
     if (builder.predCtrlHasWidth())
       return true;

visa/BuildCISAIR.h

@@ -45,7 +45,8 @@ class CISA_IR_Builder : public VISABuilder {
   CISA_IR_Builder(TARGET_PLATFORM platform, VISA_BUILDER_OPTION buildOption,
                   vISABuilderMode mode, int majorVersion, int minorVersion,
                   const WA_TABLE *pWaTable)
-      : mBuildOption(buildOption), m_builderMode(mode), m_pWaTable(pWaTable) {
+      : mBuildOption(buildOption), m_builderMode(mode), m_mem(4096),
+        m_pWaTable(pWaTable) {
     m_platformInfo = vISA::PlatformInfo::LookupPlatformInfo(platform);
     vISA_ASSERT(m_platformInfo != nullptr, "null m_platformInfo");
     m_header.major_version = majorVersion;
@@ -695,7 +696,7 @@ class CISA_IR_Builder : public VISABuilder {
 private:
   const vISA::PlatformInfo *m_platformInfo;
 
-  vISA::Mem_Manager m_mem = 4096;
+  vISA::Mem_Manager m_mem;
   const VISA_BUILDER_OPTION mBuildOption;
   // FIXME: we need to make 3D/media per kernel instead of per builder
   const vISABuilderMode m_builderMode;

visa/BuildCISAIRImpl.cpp

@@ -862,7 +862,7 @@ void CISA_IR_Builder::LinkTimeOptimization(
         auto &callerBuilder = caller->fg.builder;
         auto &calleeBuilder = callee->fg.builder;
         auto getPointerOffset = [&](G4_INST *inst, long long offset) {
-          [[maybe_unused]] auto execSize = static_cast<int>(inst->getExecSize());
+          auto execSize = static_cast<int>(inst->getExecSize());
           auto typeSize = inst->getSrc(0)->getTypeSize() * 8;
           switch (inst->opcode()) {
           case G4_mov: {

visa/BuildIR.h

@@ -260,9 +260,9 @@ class DeclarePool {
 //
 class IR_Builder {
 public:
-  const char *curFile = nullptr;
-  unsigned int curLine = 0;
-  int curCISAOffset = -1;
+  const char *curFile;
+  unsigned int curLine;
+  int curCISAOffset;
 
   static const int OrphanVISAIndex = 0xffffffff;
   int debugInfoPlaceholder =
@@ -287,7 +287,7 @@ class IR_Builder {
     IR_Builder &builder;
 
   public:
-    GlobalImmPool(IR_Builder &b) : builder(b) {}
+    GlobalImmPool(IR_Builder &b) : builder(b), immArray(), dclArray() {}
     G4_Declare *addImmVal(G4_Imm *imm, int numElt);
     int size() const { return curSize; }
     const ImmVal &getImmVal(int i) { return immArray[i]; }
@@ -305,7 +305,7 @@ class IR_Builder {
 
   int subroutineId = -1;     // the kernel itself has id 0, as we always emit a
                              // subroutine label for kernel too
-  enum VISA_BUILD_TYPE type = VISA_BUILD_TYPE::KERNEL; // as opposed to what?
+  enum VISA_BUILD_TYPE type; // as opposed to what?
 
   uint32_t m_next_local_label_id = 0;
 
@@ -365,7 +365,7 @@ class IR_Builder {
   // Indicates that sampler header cache (builtinSamplerHeader) is correctly
   // initialized with r0 contents.
   // Used only when vISA_cacheSamplerHeader option is set.
-  bool builtinSamplerHeaderInitialized = false;
+  bool builtinSamplerHeaderInitialized;
   // for PVC send WAR WA
   bool hasDF = false;
   // function call related declares
@@ -457,14 +457,14 @@ class IR_Builder {
   const CISA_IR_Builder *parentBuilder = nullptr;
 
   // stores all metadata ever allocated
-  Mem_Manager metadataMem = 4096;
+  Mem_Manager metadataMem;
   std::vector<Metadata *> allMDs;
   std::vector<MDNode *> allMDNodes;
 
   FrequencyInfo freqInfoManager;
 
   // bump pointer allocator for variable and label names, used for IR dump only.
-  Mem_Manager debugNameMem = 4096;
+  Mem_Manager debugNameMem;
 
   // Whether the kernel should avoid clobbering or even reading R0, this
   // is generally due to mid-thread preemption.

visa/BuildIRImpl.cpp

@@ -795,21 +795,16 @@ IR_Builder::IR_Builder(INST_LIST_NODE_ALLOCATOR &alloc, G4_Kernel &k,
                        Mem_Manager &m, Options *options,
                        CISA_IR_Builder *parent, FINALIZER_INFO *jitInfo,
                        const WA_TABLE *pWaTable)
-    : immPool(*this),
-      metaData(jitInfo),
-      m_pWaTable(pWaTable),
-      m_options(options),
-      CanonicalRegionStride0(0, 1, 0),
-      CanonicalRegionStride1(1, 1, 0),
-      CanonicalRegionStride2(2, 1, 0),
-      CanonicalRegionStride4(4, 1, 0),
-      parentBuilder(parent),
-      freqInfoManager(this, k),
-      r0AccessMode(getR0AccessFromOptions()),
-      mem(m), phyregpool(m, k.grfMode.getInitalGRFNum()),
-      hashtable(m), rgnpool(m), dclpool(m, *this), instList(alloc),
-      kernel(k)
-{
+    : curFile(NULL), curLine(0), curCISAOffset(-1), immPool(*this),
+      metaData(jitInfo), type(VISA_BUILD_TYPE::KERNEL), parentBuilder(parent),
+      builtinSamplerHeaderInitialized(false), m_pWaTable(pWaTable),
+      m_options(options), CanonicalRegionStride0(0, 1, 0),
+      CanonicalRegionStride1(1, 1, 0), CanonicalRegionStride2(2, 1, 0),
+      CanonicalRegionStride4(4, 1, 0), mem(m),
+      phyregpool(m, k.grfMode.getInitalGRFNum()),
+      hashtable(m), rgnpool(m), dclpool(m, *this), instList(alloc), kernel(k),
+      metadataMem(4096), debugNameMem(4096),
+      r0AccessMode(getR0AccessFromOptions()), freqInfoManager(this, k) {
   num_temp_dcl = 0;
   kernel.setBuilder(this); // kernel needs pointer to the builder
   if (!getIsPayload())
@@ -821,8 +816,9 @@ IR_Builder::IR_Builder(INST_LIST_NODE_ALLOCATOR &alloc, G4_Kernel &k,
 
   arg_size = 0;
   return_var_size = 0;
+
   if (metaData != NULL) {
-    metaData->reset();
+    memset(metaData, 0, sizeof(FINALIZER_INFO));
   }
 
   usedBarriers = BitSet(kernel.getMaxNumOfBarriers(), false);
@@ -2612,7 +2608,7 @@ G4_SendDescRaw *IR_Builder::createLscMsgDesc(
   const unsigned execSize = Get_VISA_Exec_Size(execSizeEnum);
   int src1Len = 0;
   uint32_t dataRegs = 1;
-  [[maybe_unused]] bool isBlock2D =
+  bool isBlock2D =
       op == LSC_OP::LSC_LOAD_BLOCK2D || op == LSC_OP::LSC_STORE_BLOCK2D;
   vISA_ASSERT(!isBlock2D, "block2d not implemented yet");
 

visa/ByteCodeReaderNG.cpp

@@ -290,7 +290,7 @@ static VISA_PredVar *readPreVarNG(unsigned &bytePos, const char *buf,
                                   RoutineContainer &container) {
   vISA_ASSERT_INPUT(buf != nullptr, "Argument Exception: argument buf  is NULL.");
 
-  [[maybe_unused]] uint8_t tag = 0;
+  uint8_t tag = 0;
   READ_CISA_FIELD(tag, uint8_t, bytePos, buf);
 
   uint16_t index = 0;
@@ -2448,6 +2448,7 @@ static void
 readInstructionLscUntypedAppendCounterAtomic(LSC_OP subOpcode,
                                              unsigned &bytePos, const char *buf,
                                              RoutineContainer &container) {
+  const LscOpInfo opInfo = LscOpInfoGet(subOpcode);
 
   VISA_EMask_Ctrl execMask = vISA_EMASK_M1;
   VISA_Exec_Size execSize = EXEC_SIZE_ILLEGAL;
@@ -2700,9 +2701,9 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     VISA_GenVar *decl = NULL;
     VISA_Type varType = (VISA_Type)((var->bit_properties) & 0xF);
     VISA_Align varAlign = (VISA_Align)((var->bit_properties >> 4) & 0xF);
-    [[maybe_unused]] uint8_t aliasScopeSpecifier =
+    uint8_t aliasScopeSpecifier =
         header.variables[declID].alias_scope_specifier;
-    [[maybe_unused]] int status = VISA_SUCCESS;
+    int status = VISA_SUCCESS;
 
     vISA_ASSERT(aliasScopeSpecifier == 0,
            "file scope variables are no longer supported");
@@ -2760,7 +2761,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     /// VISA Builder Call
     addr_info_t *var = &header.addresses[declID];
     VISA_AddrVar *decl = NULL;
-    [[maybe_unused]] int status = kernelBuilderImpl->CreateVISAAddrVar(
+    int status = kernelBuilderImpl->CreateVISAAddrVar(
         decl, header.strings[var->name_index], var->num_elements);
     vISA_ASSERT(VISA_SUCCESS == status, "Failed to add VISA address variable.");
 
@@ -2799,7 +2800,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     /// VISA Builder Call
     pred_info_t *var = &header.predicates[declID];
     VISA_PredVar *decl = NULL;
-    [[maybe_unused]] int status = kernelBuilderImpl->CreateVISAPredVar(
+    int status = kernelBuilderImpl->CreateVISAPredVar(
         decl, header.strings[var->name_index], var->num_elements);
     vISA_ASSERT(VISA_SUCCESS == status,
                 "Failed to add VISA predicate vairable.");
@@ -2831,7 +2832,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     unsigned declID = i;
     label_info_t *var = &header.labels[declID];
     VISA_LabelOpnd *decl = NULL;
-    [[maybe_unused]] int status = kernelBuilderImpl->CreateVISALabelVar(
+    int status = kernelBuilderImpl->CreateVISALabelVar(
         decl,
         getDeclLabelString("L", var->name_index, header,
                            VISA_Label_Kind(var->kind))
@@ -2876,7 +2877,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     unsigned declID = i;
     state_info_t *var = &header.samplers[declID];
     VISA_SamplerVar *decl = NULL;
-    [[maybe_unused]] int status = kernelBuilderImpl->CreateVISASamplerVar(
+    int status = kernelBuilderImpl->CreateVISASamplerVar(
         decl, header.strings[var->name_index], var->num_elements);
     vISA_ASSERT(VISA_SUCCESS == status, "Failed to add VISA sampler variable.");
 
@@ -2924,7 +2925,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     unsigned declID = i;
     state_info_t *var = &header.surfaces[declID];
     VISA_SurfaceVar *decl = NULL;
-    [[maybe_unused]] int status = kernelBuilderImpl->CreateVISASurfaceVar(
+    int status = kernelBuilderImpl->CreateVISASurfaceVar(
         decl, header.strings[var->name_index], var->num_elements);
     vISA_ASSERT(VISA_SUCCESS == status, "Failed to add VISA surface variable.");
 
@@ -2945,7 +2946,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
     container.surfaceVarDecls[i] = decl;
   }
 
-  [[maybe_unused]] int vmeCount = 0;
+  int vmeCount = 0;
   READ_CISA_FIELD(vmeCount, uint8_t, bytePos, buf);
   vISA_ASSERT(vmeCount == 0, "VME variable is no longer supported");
   header.vme_count = 0;
@@ -2985,7 +2986,7 @@ static void readRoutineNG(unsigned &bytePos, const char *buf,
         vISA_ASSERT_UNREACHABLE("Incorrect input variable type.");
       }
 
-      [[maybe_unused]] int status = kernelBuilderImpl->CreateVISAInputVar(
+      int status = kernelBuilderImpl->CreateVISAInputVar(
           decl, var->offset, var->size, var->getImplicitKind());
       vISA_ASSERT(VISA_SUCCESS == status, "Failed to add VISA input variable.");
 

visa/CFGStructurizer.cpp

@@ -1418,7 +1418,7 @@ ANodeHG *CFGStructurizer::getEnclosingANodeHG(ANode *AN) {
       } else {
         // Error message
         G4_BB *predBB = pred->getBeginBB();
-        [[maybe_unused]] G4_INST *predGoto = getGotoInst(predBB);
+        G4_INST *predGoto = getGotoInst(predBB);
 
         // If predGoto is null, it means that a non-goto branching inst like
         // jmpi jumps into a range of goto instrutions, such as the following:
@@ -1793,7 +1793,6 @@ ANodeBB *CFGStructurizer::addLandingBB(ANodeHG *node,
 }
 
 // Add a new empty BB as a predecessor of splitBB.
-[[maybe_unused]]
 ANode *CFGStructurizer::addSplitBBAtBegin(G4_BB *splitBB) {
   G4_BB *newBB = createBBWithLabel();
   G4_Label *newLabel = newBB->getLabel();
@@ -1925,7 +1924,6 @@ void CFGStructurizer::reConnectAllPreds(ANode *from, ANode *to) {
 // Re-connect every successors of "from" to its new predecesor "to". Update
 // "to"'s succs and its new successors' preds. Note that "from"'s succs are
 // left unchanged.
-[[maybe_unused]]
 void CFGStructurizer::reConnectAllSuccs(ANode *from, ANode *to) {
   for (ANList::iterator I = from->succs.begin(), E = from->succs.end(); I != E;
        ++I) {
@@ -2773,7 +2771,7 @@ void CFGStructurizer::convertIf(ANodeHG *node, G4_BB *nextJoinBB) {
   execSize = execSize > 1 ? execSize : kernelExecSize;
   ANList::iterator II = node->children.begin();
   ANode *thenNode = *(++II); // children[1]
-  [[maybe_unused]] G4_BB *end = node->getEndBB();
+  G4_BB *end = node->getEndBB();
   G4_BB *exit = node->getExitBB();
 
   vISA_ASSERT(end->getPhysicalSucc() == exit,

visa/CISA.l

@@ -1649,6 +1649,17 @@ static unsigned char FENCEOptions(const char* str)
     return result;
 }
 
+static COMMON_ISA_VME_OP_MODE VMEType(const char* str)
+{
+    for (int i = 0; i < VME_OP_MODE_NUM; i++)
+        if (!strcmp(vme_op_mode_str[i], str))
+            return (COMMON_ISA_VME_OP_MODE)i;
+
+    YY_FATAL_ERROR("Invalid Media Mode");
+
+    return VME_OP_MODE_NUM;
+}
+
 static CHANNEL_OUTPUT_FORMAT Get_Channel_Output(const char* str)
 {
     for (int i = 0; i < CHANNEL_OUTPUT_NUM; i++)

visa/CISA.y

@@ -30,9 +30,10 @@ void CISAerror(CISA_IR_Builder* builder, char const* msg);
 int yylex(CISA_IR_Builder *pBuilder);
 extern int CISAlineno;
 
-[[maybe_unused]] static bool streq(const char *sym0, const char *sym1);
+static bool streq(const char *sym0, const char *sym1);
 static bool ParseAlign(CISA_IR_Builder* pBuilder, const char *sym, VISA_Align &value);
 static VISA_Align AlignBytesToVisaAlignment(int bytes);
+static int DataTypeSizeOf(VISA_Type type);
 static bool ParseEMask(const char* sym, VISA_EMask_Ctrl &emask);
 
 //