Skip to content

Fix unittests to compile with v19 API changes #13

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.

Sign up for GitHub

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
adriweb merged 1 commit into from
Dec 16, 2025
Merged

Fix unittests to compile with v19 API changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ0) {
LegalizerHelper Helper(*MF, Info, Observer, B);
// Perform Legalization
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTTZ, 0));
Helper.lower(*MIBCTTZ, 0, LLT::scalar(32)));

auto CheckStr = R"(
CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTTZ_ZERO_UNDEF %0
Expand Down Expand Up @@ -232,7 +232,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ1) {
// Perform Legalization

EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTTZ, 0));
Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));

auto CheckStr = R"(
CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
Expand Down Expand Up @@ -337,7 +337,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ2) {

B.setInsertPt(*EntryMBB, MIBCTTZ->getIterator());
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTTZ, 0));
Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));

auto CheckStr = R"(
CHECK: [[NEG1:%[0-9]+]]:_(s64) = G_CONSTANT i64 -1
Expand Down Expand Up @@ -437,7 +437,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTTZ3) {
DummyGISelObserver Observer;
LegalizerHelper Helper(*MF, Info, Observer, B);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTTZ, 0));
Helper.lower(*MIBCTTZ, 0, LLT::scalar(64)));

auto CheckStr = R"(
CHECK: CTTZ
Expand All @@ -464,7 +464,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ0) {
DummyGISelObserver Observer;
LegalizerHelper Helper(*MF, Info, Observer, B);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTLZ, 0));
Helper.lower(*MIBCTLZ, 0, LLT::scalar(64)));

auto CheckStr = R"(
CHECK: [[CZU:%[0-9]+]]:_(s64) = G_CTLZ_ZERO_UNDEF %0
Expand Down Expand Up @@ -495,7 +495,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZLibcall) {
DummyGISelObserver Observer;
LegalizerHelper Helper(*MF, Info, Observer, B);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTLZ, 0));
Helper.lower(*MIBCTLZ, 0, LLT::scalar(32)));

auto CheckStr = R"(
CHECK: [[CZU:%[0-9]+]]:_(s32) = G_CTLZ_ZERO_UNDEF %0
Expand Down Expand Up @@ -528,7 +528,7 @@ TEST_F(AArch64GISelMITest, LowerBitCountingCTLZ1) {
DummyGISelObserver Observer;
LegalizerHelper Helper(*MF, Info, Observer, B);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*MIBCTLZ, 0));
Helper.lower(*MIBCTLZ, 0, s8));

auto CheckStr = R"(
CHECK: [[Trunc:%[0-9]+]]:_(s8) = G_TRUNC
Expand Down Expand Up @@ -1604,7 +1604,7 @@ TEST_F(AArch64GISelMITest, LowerFNEG) {
Helper.lower(*FNeg0, 0, LLT::scalar(64)));
B.setInstr(*FNeg1);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*FNeg1, 0));
Helper.lower(*FNeg1, 0, LLT::scalar(64)));

auto CheckStr = R"(
CHECK: [[FADD:%[0-9]+]]:_(s64) = nsz G_FADD %0:_, %1:_
Expand Down Expand Up @@ -1658,7 +1658,7 @@ TEST_F(AArch64GISelMITest, LowerMinMax) {
Helper.lower(*UMin, 0, s64));
B.setInstr(*UMax);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*UMax, 0));
Helper.lower(*UMax, 0, s64));

B.setInstr(*SMinV);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Expand All @@ -1671,7 +1671,7 @@ TEST_F(AArch64GISelMITest, LowerMinMax) {
Helper.lower(*UMinV, 0, v2s32));
B.setInstr(*UMaxV);
EXPECT_EQ(LegalizerHelper::LegalizeResult::Legalized,
Helper.lower(*UMaxV, 0));
Helper.lower(*UMaxV, 0, v2s32));

auto CheckStr = R"(
CHECK: [[CMP0:%[0-9]+]]:_(s1) = G_ICMP intpred(slt), %0:_(s64), %1:_
Expand Down
7 changes: 3 additions & 4 deletions llvm/unittests/Target/Z80/InstSizes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include "Z80Subtarget.h"
#include "Z80TargetMachine.h"
#include "llvm/ADT/STLArrayExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Triple.h"
#include "llvm/TargetParser/Triple.h"
#include "llvm/CodeGen/MIRParser/MIRParser.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineModuleInfo.h"
Expand Down Expand Up @@ -1480,7 +1479,7 @@ void checkInstructionSizes(StringRef T) {
ASSERT_TRUE(TheTarget);

std::unique_ptr<Z80TargetMachine> TM(static_cast<Z80TargetMachine *>(
TheTarget->createTargetMachine(TT, "generic", "", {}, None)));
TheTarget->createTargetMachine(TT, "generic", "", {}, std::nullopt)));
ASSERT_TRUE(TM);

Z80Subtarget STI(TM->getTargetTriple(), TM->getTargetCPU(),
Expand Down Expand Up @@ -1533,7 +1532,7 @@ void checkInstructionSizes(StringRef T) {
ASSERT_TRUE(F);
auto &MF = MMI.getOrCreateMachineFunction(*F);

ASSERT_EQ(MF.getInstructionCount(), array_lengthof(TestInstrs));
ASSERT_EQ(MF.getInstructionCount(), std::size(TestInstrs));
auto TI = std::begin(TestInstrs);
for (const auto &MBB : MF)
for (const auto &MI : MBB) {
Expand Down