diff options
| -rw-r--r-- | include/llvm/MC/MCSubtargetInfo.h | 2 | ||||
| -rw-r--r-- | lib/MC/MCSubtargetInfo.cpp | 4 | ||||
| -rw-r--r-- | utils/TableGen/SubtargetEmitter.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/llvm/MC/MCSubtargetInfo.h b/include/llvm/MC/MCSubtargetInfo.h index 3b53f20..82730d4 100644 --- a/include/llvm/MC/MCSubtargetInfo.h +++ b/include/llvm/MC/MCSubtargetInfo.h @@ -33,7 +33,7 @@ class MCSubtargetInfo { const SubtargetInfoKV *ProcItins; // Scheduling itineraries const InstrStage *Stages; // Instruction stages const unsigned *OperandCycles; // Operand cycles - const unsigned *ForwardingPathes; // Forwarding pathes + const unsigned *ForwardingPaths; // Forwarding paths unsigned NumFeatures; // Number of processor features unsigned NumProcs; // Number of processors uint64_t FeatureBits; // Feature bits for current CPU + FS diff --git a/lib/MC/MCSubtargetInfo.cpp b/lib/MC/MCSubtargetInfo.cpp index cb56a54..318e5a3 100644 --- a/lib/MC/MCSubtargetInfo.cpp +++ b/lib/MC/MCSubtargetInfo.cpp @@ -32,7 +32,7 @@ MCSubtargetInfo::InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS, ProcItins = PI; Stages = IS; OperandCycles = OC; - ForwardingPathes = FP; + ForwardingPaths = FP; NumFeatures = NF; NumProcs = NP; @@ -93,6 +93,6 @@ MCSubtargetInfo::getInstrItineraryForCPU(StringRef CPU) const { InstrItinerarySubtargetValue *V = (InstrItinerarySubtargetValue *)Found->Value; - return InstrItineraryData(V->Props, Stages, OperandCycles, ForwardingPathes, + return InstrItineraryData(V->Props, Stages, OperandCycles, ForwardingPaths, V->Itineraries); } diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp index 8089908..1c37d15 100644 --- a/utils/TableGen/SubtargetEmitter.cpp +++ b/utils/TableGen/SubtargetEmitter.cpp @@ -410,7 +410,7 @@ void SubtargetEmitter::EmitStageAndOperandCycleData(raw_ostream &OS, // Begin pipeline bypass table std::string BypassTable = "extern const unsigned " + Target + - "ForwardingPathes[] = {\n"; + "ForwardingPaths[] = {\n"; BypassTable += " 0, // No itinerary\n"; unsigned StageCount = 1, OperandCycleCount = 1; @@ -780,7 +780,7 @@ void SubtargetEmitter::run(raw_ostream &OS) { OS << Target << "ProcItinKV, " << Target << "Stages, " << Target << "OperandCycles, " - << Target << "ForwardingPathes, "; + << Target << "ForwardingPaths, "; } else OS << "0, 0, 0, 0, "; OS << NumFeatures << ", " << NumProcs << ");\n}\n\n"; @@ -826,7 +826,7 @@ void SubtargetEmitter::run(raw_ostream &OS) { OS << "extern const llvm::SubtargetInfoKV " << Target << "ProcItinKV[];\n"; OS << "extern const llvm::InstrStage " << Target << "Stages[];\n"; OS << "extern const unsigned " << Target << "OperandCycles[];\n"; - OS << "extern const unsigned " << Target << "ForwardingPathes[];\n"; + OS << "extern const unsigned " << Target << "ForwardingPaths[];\n"; } OS << ClassName << "::" << ClassName << "(StringRef TT, StringRef CPU, " @@ -845,7 +845,7 @@ void SubtargetEmitter::run(raw_ostream &OS) { OS << Target << "ProcItinKV, " << Target << "Stages, " << Target << "OperandCycles, " - << Target << "ForwardingPathes, "; + << Target << "ForwardingPaths, "; } else OS << "0, 0, 0, 0, "; OS << NumFeatures << ", " << NumProcs << ");\n}\n\n"; |