Skip to content

Commit 0d99a65

Browse files
committed
function name style, TargetVerifier comment, option name generality
1 parent 88a6d6b commit 0d99a65

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

llvm/include/llvm/Target/TargetVerifier.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// TargetVerifier looks for constructions invalid to a particular target
1313
// machine.
1414
//
15-
// To see what specifically is checked, look at TargetVerifier.cpp or an
16-
// individual backend's TargetVerifier.
15+
// To see what specifically is checked, look at an individual backend's
16+
// TargetVerifier.
1717
//
1818
//===----------------------------------------------------------------------===//
1919

@@ -35,7 +35,7 @@ class TargetVerifierPass : public PassInfoMixin<TargetVerifierPass> {
3535

3636
class TargetVerify {
3737
protected:
38-
void WriteValues(ArrayRef<const Value *> Vs) {
38+
void writeValues(ArrayRef<const Value *> Vs) {
3939
for (const Value *V : Vs) {
4040
if (!V)
4141
continue;
@@ -52,16 +52,16 @@ class TargetVerify {
5252
///
5353
/// This provides a nice place to put a breakpoint if you want to see why
5454
/// something is not correct.
55-
void CheckFailed(const Twine &Message) { MessagesStr << Message << '\n'; }
55+
void checkFailed(const Twine &Message) { MessagesStr << Message << '\n'; }
5656

5757
/// A check failed (with values to print).
5858
///
5959
/// This calls the Message-only version so that the above is easier to set
6060
/// a breakpoint on.
6161
template <typename T1, typename... Ts>
62-
void CheckFailed(const Twine &Message, const T1 &V1, const Ts &...Vs) {
63-
CheckFailed(Message);
64-
WriteValues({V1, Vs...});
62+
void checkFailed(const Twine &Message, const T1 &V1, const Ts &...Vs) {
63+
checkFailed(Message);
64+
writeValues({V1, Vs...});
6565
}
6666

6767
public:

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,7 @@ extern char &AMDGPUWaitSGPRHazardsLegacyID;
552552

553553
FunctionPass *createAMDGPUTargetVerifierLegacyPass(bool FatalErrors);
554554
void initializeAMDGPUTargetVerifierLegacyPassPass(PassRegistry &);
555-
class AMDGPUTargetVerifierPass : public TargetVerifierPass {
556-
public:
555+
struct AMDGPUTargetVerifierPass : public TargetVerifierPass {
557556
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM) override;
558557
};
559558

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static cl::opt<bool> HasClosedWorldAssumption(
481481
cl::desc("Whether has closed-world assumption at link time"),
482482
cl::init(false), cl::Hidden);
483483

484-
static cl::opt<bool> VerifyTarget("verify-tgt",
484+
static cl::opt<bool> VerifyTarget("amdgpu-verify-tgt",
485485
cl::desc("Enable the target verifier"));
486486

487487
extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {

llvm/lib/Target/AMDGPU/AMDGPUTargetVerifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ using namespace llvm;
3434
#define Check(C, ...) \
3535
do { \
3636
if (!(C)) { \
37-
TargetVerify::CheckFailed(__VA_ARGS__); \
37+
TargetVerify::checkFailed(__VA_ARGS__); \
3838
} \
3939
} while (false)
4040

llvm/test/CodeGen/AMDGPU/tgt-verify-llc-fail.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-tgt -o - < %s 2>&1 | FileCheck %s
1+
; RUN: llc -mtriple=amdgcn -mcpu=gfx900 -amdgpu-verify-tgt -o - < %s 2>&1 | FileCheck %s
22

33
define amdgpu_cs i32 @nonvoid_shader() {
44
; CHECK: Shaders must return void

llvm/test/CodeGen/AMDGPU/tgt-verify-llc-pass.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-tgt %s -o - 2>&1 | FileCheck %s --allow-empty
1+
; RUN: llc -mtriple=amdgcn -mcpu=gfx900 -amdgpu-verify-tgt %s -o - 2>&1 | FileCheck %s --allow-empty
22

33
define amdgpu_cs void @void_shader() {
44
; CHECK-NOT: Shaders must return void

0 commit comments

Comments
 (0)