Merge branch 'master' into NewAMDLLVMENv

CSUS-LLVM · May 27, 2022 · 009097b · 009097b
2 parents 4aefcc9 + 5df3319
commit 009097b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/example/optsched-cfg/sched.ini b/example/optsched-cfg/sched.ini
@@ -345,5 +345,5 @@ SHOULD_LIMIT_OCCUPANCY YES
 # NONE: do not use limits -- defaults to unlimited
 OCCUPANCY_LIMIT_SOURCE FILE
 
-# The value of occupancy (1-10) at which we no longer try to optimize RP 
+# The value of occupancy (1-10) at which we no longer try to optimize RP
 OCCUPANCY_LIMIT 4
diff --git a/include/opt-sched/Scheduler/machine_model.h b/include/opt-sched/Scheduler/machine_model.h
@@ -10,10 +10,10 @@ Last Update:  Mar. 2011
 #ifndef OPTSCHED_BASIC_MACHINE_MODEL_H
 #define OPTSCHED_BASIC_MACHINE_MODEL_H
 
+#include "opt-sched/Scheduler/defines.h"
 #include "llvm/ADT/StringRef.h"
 // For class ostream.
 #include <iostream>
-#include "opt-sched/Scheduler/defines.h"
 // For class string.
 #include <string>
 // For class vector.

diff --git a/lib/Scheduler/register.cpp b/lib/Scheduler/register.cpp
@@ -90,8 +90,8 @@ void llvm::opt_sched::Register::IncrmntCrntLngth() { crntLngth_++; }
 
 void llvm::opt_sched::Register::DcrmntCrntLngth() { crntLngth_--; }
 
-llvm::opt_sched::Register &llvm::opt_sched::Register::
-operator=(const llvm::opt_sched::Register &rhs) {
+llvm::opt_sched::Register &
+llvm::opt_sched::Register::operator=(const llvm::opt_sched::Register &rhs) {
   if (this != &rhs) {
     num_ = rhs.num_;
     type_ = rhs.type_;