Skip to content

Commit 2ecbb77

Browse files
gonzalobggonzalobg
committed
[NVPTX]: Fix typos
1 parent 748d598 commit 2ecbb77

File tree

4 files changed

+44
-39
lines changed

4 files changed

+44
-39
lines changed

‎llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ void NVPTXInstPrinter::printLdStCode(const MCInst *MI, int OpNum,
228228
const MCOperand &MO = MI->getOperand(OpNum);
229229
int Imm = (int) MO.getImm();
230230
if (!strcmp(Modifier, "sem")) {
231-
auto ordering =
231+
auto Ordering =
232232
NVPTX::Ordering(static_cast<NVPTX::OrderingUnderlyingType>(Imm));
233-
switch (ordering) {
233+
switch (Ordering) {
234234
case NVPTX::Ordering::NotAtomic:
235235
break;
236236
case NVPTX::Ordering::Volatile:
@@ -251,15 +251,15 @@ void NVPTXInstPrinter::printLdStCode(const MCInst *MI, int OpNum,
251251
default:
252252
SmallString<256> Msg;
253253
raw_svector_ostream OS(Msg);
254-
OS << "NVPTX LdStCode Printer does not support \"" << ordering
254+
OS << "NVPTX LdStCode Printer does not support \"" << Ordering
255255
<< "\" sem modifier.";
256256
report_fatal_error(OS.str());
257257
break;
258258
}
259259
} else if (!strcmp(Modifier, "sc")) {
260-
auto ordering =
260+
auto Ordering =
261261
NVPTX::Ordering(static_cast<NVPTX::OrderingUnderlyingType>(Imm));
262-
switch (ordering) {
262+
switch (Ordering) {
263263
// TODO: refactor fence insertion in ISelDagToDag instead of here
264264
// as part of implementing atomicrmw seq_cst.
265265
case NVPTX::Ordering::SequentiallyConsistent:

‎llvm/lib/Target/NVPTX/NVPTX.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -122,32 +122,32 @@ enum class Ordering : OrderingUnderlyingType {
122122
LAST = RelaxedMMIO
123123
};
124124

125-
template <typename OStream> OStream &operator<<(OStream &os, Ordering order) {
126-
switch (order) {
125+
template <typename OStream> OStream &operator<<(OStream &O, Ordering Order) {
126+
switch (Order) {
127127
case Ordering::NotAtomic:
128-
os << "NotAtomic";
129-
return os;
128+
O << "NotAtomic";
129+
return O;
130130
case Ordering::Relaxed:
131-
os << "Relaxed";
132-
return os;
131+
O << "Relaxed";
132+
return O;
133133
case Ordering::Acquire:
134-
os << "Acquire";
135-
return os;
134+
O << "Acquire";
135+
return O;
136136
case Ordering::Release:
137-
os << "Release";
138-
return os;
137+
O << "Release";
138+
return O;
139139
// case Ordering::AcquireRelease:
140-
// os << "AcquireRelease";
141-
// return os;
140+
// O << "AcquireRelease";
141+
// return O;
142142
case Ordering::SequentiallyConsistent:
143-
os << "SequentiallyConsistent";
144-
return os;
143+
O << "SequentiallyConsistent";
144+
return O;
145145
case Ordering::Volatile:
146-
os << "Volatile";
147-
return os;
146+
O << "Volatile";
147+
return O;
148148
case Ordering::RelaxedMMIO:
149-
os << "RelaxedMMIO";
150-
return os;
149+
O << "RelaxedMMIO";
150+
return O;
151151
}
152152
report_fatal_error("unknown ordering");
153153
}

‎llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp

+21-14
Original file line numberDiff line numberDiff line change
@@ -715,12 +715,12 @@ static unsigned int getCodeAddrSpace(MemSDNode *N) {
715715
}
716716

717717
struct OperationOrderings {
718-
NVPTX::OrderingUnderlyingType instr_ordering;
719-
NVPTX::OrderingUnderlyingType fence_ordering;
718+
NVPTX::OrderingUnderlyingType InstrOrdering;
719+
NVPTX::OrderingUnderlyingType FenceOrdering;
720720
OperationOrderings(NVPTX::Ordering o = NVPTX::Ordering::NotAtomic,
721721
NVPTX::Ordering f = NVPTX::Ordering::NotAtomic)
722-
: instr_ordering(static_cast<NVPTX::OrderingUnderlyingType>(o)),
723-
fence_ordering(static_cast<NVPTX::OrderingUnderlyingType>(f)) {}
722+
: InstrOrdering(static_cast<NVPTX::OrderingUnderlyingType>(o)),
723+
FenceOrdering(static_cast<NVPTX::OrderingUnderlyingType>(f)) {}
724724
};
725725

726726
static OperationOrderings
@@ -758,12 +758,19 @@ getOperationOrderings(MemSDNode *N, const NVPTXSubtarget *Subtarget) {
758758
// Lustig et al, A Formal Analysis of the NVIDIA PTX Memory Consistency Model, ASPLOS’19.
759759
// https://dl.acm.org/doi/pdf/10.1145/3297858.3304043
760760
//
761-
// | CUDA C++ Atomic Operation or Atomic Fence | PTX Atomic Operation or Fence |
762-
// |-----------------------------------------------------------------------------|-----------------------------------------|
763-
// | cuda::atomic_thread_fence(memory_order_seq_cst, cuda::thread_scope_<scope>) | fence.sc.<scope>; |
764-
// | cuda::atomic_load(memory_order_seq_cst, cuda::thread_scope_<scope>) | fence.sc.<scope>; ld.acquire.<scope>; |
765-
// | cuda::atomic_store(memory_order_seq_cst, cuda::thread_scope_<scope>) | fence.sc.<scope>; st.release.<scope>; |
766-
// | cuda::atomic_fetch_<op>(memory_order_seq_cst, cuda::thread_scope_<scope>) | fence.sc.<scope>; atom.acq_rel.<scope>; |
761+
// | CUDA C++ Atomic Operation or Atomic Fence | PTX Atomic Operation or Fence |
762+
// |------------------------------------------------------|-------------------------------|
763+
// | cuda::atomic_thread_fence | fence.sc.<scope>; |
764+
// | (memory_order_seq_cst, cuda::thread_scope_<scope>) | |
765+
// |------------------------------------------------------|-------------------------------|
766+
// | cuda::atomic_load | fence.sc.<scope>; |
767+
// | (memory_order_seq_cst, cuda::thread_scope_<scope>) | ld.acquire.<scope>; |
768+
// |------------------------------------------------------|-------------------------------|
769+
// | cuda::atomic_store | fence.sc.<scope>; |
770+
// | (memory_order_seq_cst, cuda::thread_scope_<scope>) | st.release.<scope>; |
771+
// |------------------------------------------------------|-------------------------------|
772+
// | cuda::atomic_fetch_<op> | fence.sc.<scope>; |
773+
// | (memory_order_seq_cst, cuda::thread_scope_<scope>) | atom.acq_rel.<scope>; |
767774

768775
// clang-format on
769776

@@ -892,11 +899,11 @@ getOperationOrderings(MemSDNode *N, const NVPTXSubtarget *Subtarget) {
892899
//
893900
// This sets the ordering of the fence to SequentiallyConsistent, and
894901
// sets the corresponding ordering for the instruction.
895-
NVPTX::Ordering ord;
902+
NVPTX::Ordering InstrOrder;
896903
if (N->readMem()) {
897-
ord = NVPTX::Ordering::Acquire;
904+
InstrOrder = NVPTX::Ordering::Acquire;
898905
} else if (N->writeMem()) {
899-
ord = NVPTX::Ordering::Release;
906+
InstrOrder = NVPTX::Ordering::Release;
900907
} else {
901908
SmallString<256> Msg;
902909
raw_svector_ostream OS(Msg);
@@ -907,7 +914,7 @@ getOperationOrderings(MemSDNode *N, const NVPTXSubtarget *Subtarget) {
907914
report_fatal_error(OS.str());
908915
}
909916
return AddrGenericOrGlobalOrShared
910-
? OperationOrderings(ord,
917+
? OperationOrderings(InstrOrder,
911918
NVPTX::Ordering::SequentiallyConsistent)
912919
: OperationOrderings(NVPTX::Ordering::NotAtomic);
913920
}

‎llvm/test/CodeGen/NVPTX/load-store-sm-70.ll

-2
Original file line numberDiff line numberDiff line change
@@ -1002,5 +1002,3 @@ define void @local_acq_rel_volatile(ptr addrspace(5) %a, ptr addrspace(5) %b, pt
10021002

10031003
ret void
10041004
}
1005-
1006-

0 commit comments

Comments
 (0)