Update GRF number based on kernel attribute before verification

Author: jfuentes

visa/BuildCISAIRImpl.cpp

@@ -1648,7 +1648,9 @@ int CISA_IR_Builder::Compile(const char *isaasmFileName, bool emit_visa_only) {
 
     int status = VISA_SUCCESS;
     for (auto func : m_kernelsAndFunctions) {
-      func->finalizeAttributes();
+      bool attrWithoutError = func->finalizeAttributes();
+      if (!attrWithoutError)
+        return VISA_FAILURE;
     }
 
     if (m_options.getOption(vISA_GenerateISAASM) ||
@@ -1718,7 +1720,9 @@ int CISA_IR_Builder::Compile(const char *isaasmFileName, bool emit_visa_only) {
       }
 
       mainKernel = (kernel->getIsKernel()) ? kernel : mainKernel;
-      kernel->finalizeAttributes();
+      bool attrWithoutError = kernel->finalizeAttributes();
+      if (!attrWithoutError)
+        return VISA_FAILURE;
       kernel->getIRBuilder()->setType(kernel->getType());
       if (kernel->getIsKernel() == false) {
         if (kernel->getIRBuilder()->getArgSize() <

visa/VISAKernel.h

@@ -123,7 +123,7 @@ class VISAKernelImpl : public VISAFunction {
 
   vISA::Attributes *getKernelAttributes() { return m_kernelAttrs; }
   // Temporary function to move options to attributes!
-  void finalizeAttributes();
+  bool finalizeAttributes();
 
   void setName(const char *n);
   const char *getName() const { return m_name.c_str(); }

visa/VISAKernelImpl.cpp

@@ -126,15 +126,6 @@ int VISAKernelImpl::compileFastPath() {
         m_kernelAttrs->isKernelAttrSet(Attributes::ATTR_RetValSize))),
       "vISA: input for function must have attributes ArgSize and RetValSize!");
 
-  if (getIsKernel() &&
-      m_kernelAttrs->isKernelAttrSet(Attributes::ATTR_NumGRF)) {
-    if (!m_kernel->updateKernelFromNumGRFAttr()) {
-      m_builder->criticalMsgStream()
-          << "vISA: wrong value for .kernel_attr NumGRF";
-      return VISA_FAILURE;
-    }
-  }
-
   if (getIsKernel()) {
     status = calculateTotalInputSize();
   }
@@ -8423,16 +8414,23 @@ void VISAKernelImpl::setGenxDebugInfoBuffer(char *buffer, unsigned long size) {
 
 /**
  *  finalizeAttributes() sets attributes based on options, etc.
- *     This is a temporary solution to move some options to attributes.
- *     Once clients set attributes directily without using options, this
- *     function shall be removed.
+ *     Also, updates GRF configuration based on kernel attribute.
+ *     Returns true if no error is found, false otherwise.
  */
-void VISAKernelImpl::finalizeAttributes() {
+bool VISAKernelImpl::finalizeAttributes() {
   if (!m_kernelAttrs->isKernelAttrSet(Attributes::ATTR_Target)) {
     VISATarget target = m_options->getTarget();
     uint8_t val = (uint8_t)target;
     AddKernelAttribute("Target", sizeof(val), &val);
   }
+  if (m_kernelAttrs->isKernelAttrSet(Attributes::ATTR_NumGRF)) {
+    if (!m_kernel->updateKernelFromNumGRFAttr()) {
+      m_builder->criticalMsgStream()
+          << "vISA: wrong value for .kernel_attr NumGRF";
+      return false;
+    }
+  }
+  return true;
 }
 
 VISA_LabelOpnd *