Skip to content

Commit

Permalink
[NVPTX]: Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzalobg committed Jul 15, 2024
1 parent 748d598 commit f451b51
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ void NVPTXInstPrinter::printLdStCode(const MCInst *MI, int OpNum,
const MCOperand &MO = MI->getOperand(OpNum);
int Imm = (int) MO.getImm();
if (!strcmp(Modifier, "sem")) {
auto ordering =
auto Ordering =
NVPTX::Ordering(static_cast<NVPTX::OrderingUnderlyingType>(Imm));
switch (ordering) {
switch (Ordering) {
case NVPTX::Ordering::NotAtomic:
break;
case NVPTX::Ordering::Volatile:
Expand All @@ -251,15 +251,15 @@ void NVPTXInstPrinter::printLdStCode(const MCInst *MI, int OpNum,
default:
SmallString<256> Msg;
raw_svector_ostream OS(Msg);
OS << "NVPTX LdStCode Printer does not support \"" << ordering
OS << "NVPTX LdStCode Printer does not support \"" << Ordering
<< "\" sem modifier.";
report_fatal_error(OS.str());
break;
}
} else if (!strcmp(Modifier, "sc")) {
auto ordering =
auto Ordering =
NVPTX::Ordering(static_cast<NVPTX::OrderingUnderlyingType>(Imm));
switch (ordering) {
switch (Ordering) {
// TODO: refactor fence insertion in ISelDagToDag instead of here
// as part of implementing atomicrmw seq_cst.
case NVPTX::Ordering::SequentiallyConsistent:
Expand Down
36 changes: 18 additions & 18 deletions llvm/lib/Target/NVPTX/NVPTX.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,32 +122,32 @@ enum class Ordering : OrderingUnderlyingType {
LAST = RelaxedMMIO
};

template <typename OStream> OStream &operator<<(OStream &os, Ordering order) {
switch (order) {
template <typename OStream> OStream &operator<<(OStream &O, Ordering Order) {
switch (Order) {
case Ordering::NotAtomic:
os << "NotAtomic";
return os;
O << "NotAtomic";
return O;
case Ordering::Relaxed:
os << "Relaxed";
return os;
O << "Relaxed";
return O;
case Ordering::Acquire:
os << "Acquire";
return os;
O << "Acquire";
return O;
case Ordering::Release:
os << "Release";
return os;
O << "Release";
return O;
// case Ordering::AcquireRelease:
// os << "AcquireRelease";
// return os;
// O << "AcquireRelease";
// return O;
case Ordering::SequentiallyConsistent:
os << "SequentiallyConsistent";
return os;
O << "SequentiallyConsistent";
return O;
case Ordering::Volatile:
os << "Volatile";
return os;
O << "Volatile";
return O;
case Ordering::RelaxedMMIO:
os << "RelaxedMMIO";
return os;
O << "RelaxedMMIO";
return O;
}
report_fatal_error("unknown ordering");
}
Expand Down
16 changes: 8 additions & 8 deletions llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -715,12 +715,12 @@ static unsigned int getCodeAddrSpace(MemSDNode *N) {
}

struct OperationOrderings {
NVPTX::OrderingUnderlyingType instr_ordering;
NVPTX::OrderingUnderlyingType fence_ordering;
NVPTX::OrderingUnderlyingType InstrOrdering;
NVPTX::OrderingUnderlyingType FenceOrdering;
OperationOrderings(NVPTX::Ordering o = NVPTX::Ordering::NotAtomic,
NVPTX::Ordering f = NVPTX::Ordering::NotAtomic)
: instr_ordering(static_cast<NVPTX::OrderingUnderlyingType>(o)),
fence_ordering(static_cast<NVPTX::OrderingUnderlyingType>(f)) {}
: InstrOrdering(static_cast<NVPTX::OrderingUnderlyingType>(o)),
FenceOrdering(static_cast<NVPTX::OrderingUnderlyingType>(f)) {}
};

static OperationOrderings
Expand Down Expand Up @@ -892,11 +892,11 @@ getOperationOrderings(MemSDNode *N, const NVPTXSubtarget *Subtarget) {
//
// This sets the ordering of the fence to SequentiallyConsistent, and
// sets the corresponding ordering for the instruction.
NVPTX::Ordering ord;
NVPTX::Ordering InstrOrder;
if (N->readMem()) {
ord = NVPTX::Ordering::Acquire;
InstrOrder = NVPTX::Ordering::Acquire;
} else if (N->writeMem()) {
ord = NVPTX::Ordering::Release;
InstrOrder = NVPTX::Ordering::Release;
} else {
SmallString<256> Msg;
raw_svector_ostream OS(Msg);
Expand All @@ -907,7 +907,7 @@ getOperationOrderings(MemSDNode *N, const NVPTXSubtarget *Subtarget) {
report_fatal_error(OS.str());
}
return AddrGenericOrGlobalOrShared
? OperationOrderings(ord,
? OperationOrderings(InstrOrder,
NVPTX::Ordering::SequentiallyConsistent)
: OperationOrderings(NVPTX::Ordering::NotAtomic);
}
Expand Down

0 comments on commit f451b51

Please sign in to comment.