Refactor pre-RA scheduling to use kernel getters instead of options.

Change-Id: I275c9190773fdb4ba0659fdc563373b871c3019d

Author: jfuentes

visa/FlowGraph.cpp

@@ -3356,10 +3356,10 @@ void G4_Kernel::evalAddrExp()
 
 void G4_Kernel::setKernelParameters()
 {
-    unsigned numThreads = m_options->getuInt32Option(vISA_HWThreadNumberPerEU);
+    unsigned overrideGRFNum = m_options->getuInt32Option(vISA_TotalGRFNum);
+
 
     // Set the number of GRFs
-    unsigned overrideGRFNum = m_options->getuInt32Option(vISA_TotalGRFNum);
     if (overrideGRFNum > 0)
     {
         // User-provided number of GRFs

visa/FlowGraph.h

@@ -1509,9 +1509,9 @@ class G4_Kernel
                 (major == COMMON_ISA_MAJOR_VER && minor <= COMMON_ISA_MINOR_VER),
             "CISA version not supported by this JIT-compiler");
 
-        setKernelParameters();
 
         name = NULL;
+        numThreads = 0;
         simdSize = 0;
         hasAddrTaken = false;
         kernelDbgInfo = nullptr;
@@ -1524,6 +1524,8 @@ class G4_Kernel
         {
             gtPinInfo = nullptr;
         }
+
+        setKernelParameters();
     }
 
     ~G4_Kernel();
@@ -1540,6 +1542,13 @@ class G4_Kernel
     void setNumThreads(int nThreads) { numThreads = nThreads; }
     uint32_t getNumThreads() const { return numThreads; }
 
+    void updateKernelByNumThreads(int nThreads)
+    {
+        numThreads = nThreads;
+        m_options->setOption(vISA_TotalGRFNum, (uint32_t)0);
+        setKernelParameters();
+    }
+
     void setNumSWSBTokens(int nSWSBs) { numSWSBTokens = nSWSBs; }
     uint32_t getNumSWSBTokens() const { return numSWSBTokens; }
 

visa/LocalScheduler/G4_Sched.cpp

@@ -486,14 +486,13 @@ class BB_Scheduler {
 
 } // namespace
 
-static unsigned getRPReductionThreshold(G4_Kernel &kernel)
+static unsigned getRPReductionThreshold(unsigned NumGrfs, unsigned simdSize)
 {
-    unsigned NumGrfs = kernel.getNumRegTotal();
     float Ratio = NumGrfs / 128.0f;
 
     // For SIMD32 kernels, use a higher threshold for rp reduction,
     // as it may not be beneficial.
-    if (kernel.getSimdSize() == 32)
+    if (simdSize == 32)
         return unsigned(PRESSURE_REDUCTION_THRESHOLD_SIMD32 * Ratio);
 
     // For all other kernels, use the default threshold.
@@ -531,7 +530,7 @@ bool preRA_Scheduler::run()
             return false;
     }
 
-    unsigned Threshold = getRPReductionThreshold(kernel);
+    unsigned Threshold = getRPReductionThreshold(kernel.getNumRegTotal(), kernel.getSimdSize());
     unsigned SchedCtrl = m_options->getuInt32Option(vISA_preRA_ScheduleCtrl);
 
     LatencyTable LT(kernel.fg.builder);

visa/LocalScheduler/SWSB_G4IR.cpp

@@ -5119,7 +5119,7 @@ void SWSB::dumpTokenLiveInfo()
         std::cerr << std::endl;
         if (BBVector[i]->killedTokens != nullptr)
         {
-            uint32_t totalTokenNum = kernel.getOptions()->getuInt32Option(vISA_SWSBTokenNum);
+            uint32_t totalTokenNum = kernel.getNumSWSBTokens();
             for (uint32_t k = 0; k < totalTokenNum; k++)
             {
                 if (BBVector[i]->killedTokens->isSet(k))

visa/VISAKernelImpl.cpp

@@ -1494,7 +1494,7 @@ int VISAKernelImpl::CreateVISAInputVar(CISA_GEN_VAR *decl,
             dcl->getRegVar()->setPhyReg(m_phyRegPool->getGreg(regNum), subRegNum);
             dcl->setRegFile( G4_INPUT );
             unsigned int reservedGRFNum = m_options->getuInt32Option(vISA_ReservedGRFNum);
-            if (regNum + dcl->getNumRows() > m_builder->getOptions()->getuInt32Option(vISA_TotalGRFNum) - reservedGRFNum) {
+            if (regNum + dcl->getNumRows() > m_kernel->getNumRegTotal() - reservedGRFNum) {
                 MUST_BE_TRUE(false, "INPUT payload execeeds the regsiter number");
             }
         }

visa/include/VISAOptions.def

@@ -164,7 +164,7 @@ DEF_VISA_OPTION(vISA_SWSBTokenBarrier,    ET_INT32, "-SWSBTokenBarrier",  UNUSED
 DEF_VISA_OPTION(vISA_EnableSwitch,      ET_BOOL,  "-enableSwitch",    UNUSED, false)
 DEF_VISA_OPTION(vISA_EnableISBIDBUNDLE,      ET_BOOL,  "-SBIDBundle",    UNUSED, false)
 DEF_VISA_OPTION(vISA_EnableGroupScheduleForBC,      ET_BOOL,  "-groupScheduleForBC",    UNUSED, true)
-DEF_VISA_OPTION(vISA_SWSBTokenNum,        ET_INT32, "-SWSBTokenNum",      "USAGE: -SWSBTokenNum <tokenNum>\n", 16)
+DEF_VISA_OPTION(vISA_SWSBTokenNum,        ET_INT32, "-SWSBTokenNum",      "USAGE: -SWSBTokenNum <tokenNum>\n", 0)
 DEF_VISA_OPTION(vISA_EnableSendTokenReduction,      ET_BOOL,  "-SendTokenReduction",    UNUSED, false)
 DEF_VISA_OPTION(vISA_GlobalTokenAllocation,      ET_BOOL,  "-globalTokenAllocation",    UNUSED, false)
 DEF_VISA_OPTION(vISA_DistPropTokenAllocation,      ET_BOOL,  "-distPropTokenAllocation",    UNUSED, false)