Merge remote-tracking branch 'origin/vlsu' into vlsu

Merging origin branch into local

CMakeLists.txt

@@ -35,6 +35,7 @@ include_directories(${SPARTA_INCLUDE_DIRS})
 # Set up STF library
 set (STF_LIB_BASE ${PROJECT_SOURCE_DIR}/stf_lib)
 set (DISABLE_STF_DOXYGEN ON)
+set (DISABLE_STF_TESTS ON)
 
 if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
   set (FULL_LTO true)

core/VectorUopGenerator.cpp

@@ -25,11 +25,10 @@ namespace olympia
         // Does the instruction have tail elements?
         const uint32_t num_elems = current_VCSRs->vl / current_VCSRs->sew;
         inst->setTail(num_elems < current_VCSRs->vlmax);
-
         if(num_uops_to_generate_ > 1)
         {
             // Original instruction will act as the first UOp
-            inst->setUOpID(0); // set UOpID()   
+            inst->setUOpID(0); // set UOpID()
             current_inst_ = inst;
             current_inst_->setUOpCount(num_uops_to_generate_);
             ILOG("Inst: " << current_inst_ << " is being split into " << num_uops_to_generate_ << " UOPs");
@@ -106,4 +105,4 @@ namespace olympia
             reset_();
         }
     }
-} // namespace olympia
+} // namespace olympia