Obtain number of threads from kernel instead of builder in local scheduler.

Change-Id: Icaa00741155c6cb496b7b2671f042f9e9c6690dd

Author: jfuentes

visa/FlowGraph.cpp

@@ -3416,8 +3416,16 @@ void G4_Kernel::setKernelParameters()
         default:
             numAcc = 2;
         }
+    }
 
-
+    // Set number of threads if it was not defined before
+    if (numThreads == 0)
+    {
+        switch (getGenxPlatform())
+        {
+        default:
+            numThreads = 7;
+        }
     }
 }
 

visa/HWCaps.inc

@@ -521,12 +521,6 @@
         return Type_HF;
     }
 
-    unsigned getHWThreadNumberPerEU() const
-    {
-        unsigned Val = getOptions()->getuInt32Option(vISA_HWThreadNumberPerEU);
-        return (Val != 0) ? Val : 7;
-    }
-
     // each flag register is 16-bit
     uint32_t getNumFlagRegisters(void)
     {

visa/LocalScheduler/LocalScheduler_G4IR.cpp

@@ -236,7 +236,7 @@ G4_BB_Schedule::G4_BB_Schedule(G4_Kernel* k, Mem_Manager& m, G4_BB* block,
     // Update the listing of the basic block with the reordered code.
     INST_LIST_ITER inst_it = bb->begin();
     Node *prevNode = nullptr;
-    unsigned HWThreadsPerEU = getBuilder()->getHWThreadNumberPerEU();
+    unsigned HWThreadsPerEU = k->getNumThreads();
     size_t scheduleInstSize = 0;
     for (Node *currNode : scheduledNodes) {
         for (G4_INST *inst : *currNode->getInstructions()) {
@@ -1195,7 +1195,7 @@ DDD::DDD(Mem_Manager& m, G4_BB* bb, const LatencyTable& lt, G4_Kernel* k)
     , kernel(k)
 {
     Node* lastBarrier = nullptr;
-    HWthreadsPerEU = getBuilder()->getHWThreadNumberPerEU();
+    HWthreadsPerEU = k->getNumThreads();
     useMTLatencies = getBuilder()->useMultiThreadLatency();
     totalGRFNum = kernel->getNumRegTotal();
     bool BTIIsRestrict = getOptions()->getOption(vISA_ReorderDPSendToDifferentBti);