Skip to content

[NVPTX] Delete IsSimpleMove (NFC) #129178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXBaseInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ using namespace NVPTXAS;
namespace NVPTXII {
enum {
// These must be kept in sync with TSFlags in NVPTXInstrFormats.td
IsTexFlag = 0x80,
IsSuldMask = 0x300,
IsSuldShift = 8,
IsSustFlag = 0x400,
IsSurfTexQueryFlag = 0x800,
IsTexModeUnifiedFlag = 0x1000
// clang-format off
IsTexFlag = 0x40,
IsSuldMask = 0x180,
IsSuldShift = 0x7,
IsSustFlag = 0x200,
IsSurfTexQueryFlag = 0x400,
IsTexModeUnifiedFlag = 0x800,
// clang-format on
};
} // namespace NVPTXII

Expand Down
18 changes: 8 additions & 10 deletions llvm/lib/Target/NVPTX/NVPTXInstrFormats.td
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class NVPTXInst<dag outs, dag ins, string asmstr, list<dag> pattern>

// TSFlagFields
bits<4> VecInstType = VecNOP.Value;
bit IsSimpleMove = false;
bit IsLoad = false;
bit IsStore = false;

Expand All @@ -46,13 +45,12 @@ class NVPTXInst<dag outs, dag ins, string asmstr, list<dag> pattern>
// 2**(2-1) = 2.
bits<2> IsSuld = 0;

let TSFlags{3...0} = VecInstType;
let TSFlags{4...4} = IsSimpleMove;
let TSFlags{5...5} = IsLoad;
let TSFlags{6...6} = IsStore;
let TSFlags{7} = IsTex;
let TSFlags{9...8} = IsSuld;
let TSFlags{10} = IsSust;
let TSFlags{11} = IsSurfTexQuery;
let TSFlags{12} = IsTexModeUnified;
let TSFlags{3...0} = VecInstType;
let TSFlags{4} = IsLoad;
let TSFlags{5} = IsStore;
let TSFlags{6} = IsTex;
let TSFlags{8...7} = IsSuld;
let TSFlags{9} = IsSust;
let TSFlags{10} = IsSurfTexQuery;
let TSFlags{11} = IsTexModeUnified;
}
2 changes: 1 addition & 1 deletion llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ let hasSideEffects = false in {


// copyPhysreg is hard-coded in NVPTXInstrInfo.cpp
let IsSimpleMove=1, hasSideEffects=0, isAsCheapAsAMove=1 in {
let hasSideEffects=0, isAsCheapAsAMove=1 in {
def IMOV1rr : NVPTXInst<(outs Int1Regs:$dst), (ins Int1Regs:$sss),
"mov.pred \t$dst, $sss;", []>;
def IMOV16rr : NVPTXInst<(outs Int16Regs:$dst), (ins Int16Regs:$sss),
Expand Down