Skip to content

Commit e9898be

Browse files
phatephate
authored
Move TestRvsdgs.[hpp/cpp] to jlm::llvm namespace (phate#1462)
1 parent afde4d0 commit e9898be

23 files changed

+372
-341
lines changed

‎jlm/llvm/Makefile.sub‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
libllvm_SOURCES = \
55
jlm/llvm/DotWriter.cpp \
6+
jlm/llvm/TestRvsdgs.cpp \
67
\
78
jlm/llvm/backend/IpGraphToLlvmConverter.cpp \
89
jlm/llvm/backend/RvsdgToIpGraphConverter.cpp \
@@ -77,6 +78,7 @@ libllvm_SOURCES = \
7778

7879
libllvm_HEADERS = \
7980
jlm/llvm/DotWriter.hpp \
81+
jlm/llvm/TestRvsdgs.hpp \
8082
\
8183
jlm/llvm/backend/IpGraphToLlvmConverter.hpp \
8284
jlm/llvm/backend/RvsdgToIpGraphConverter.hpp \

tests/TestRvsdgs.cpp renamed to jlm/llvm/TestRvsdgs.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
* See COPYING for terms of redistribution.
44
*/
55

6-
#include "TestRvsdgs.hpp"
6+
#include <jlm/llvm/ir/operators.hpp>
7+
#include <jlm/llvm/TestRvsdgs.hpp>
8+
#include <jlm/rvsdg/gamma.hpp>
9+
#include <jlm/rvsdg/theta.hpp>
710

8-
namespace jlm::tests
11+
namespace jlm::llvm
912
{
1013

1114
std::unique_ptr<jlm::llvm::RvsdgModule>

tests/TestRvsdgs.hpp renamed to jlm/llvm/TestRvsdgs.hpp

Lines changed: 114 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,23 @@
33
* See COPYING for terms of redistribution.
44
*/
55

6-
#include <jlm/llvm/ir/operators.hpp>
6+
#ifndef JLM_LLVM_TESTRVSDGS_HPP
7+
#define JLM_LLVM_TESTRVSDGS_HPP
8+
9+
#include <jlm/llvm/ir/operators/delta.hpp>
710
#include <jlm/llvm/ir/RvsdgModule.hpp>
8-
#include <jlm/rvsdg/gamma.hpp>
9-
#include <jlm/rvsdg/theta.hpp>
11+
#include <jlm/rvsdg/lambda.hpp>
1012

11-
namespace jlm::tests
13+
namespace jlm::rvsdg
14+
{
15+
class Graph;
16+
class GammaNode;
17+
class LambdaNode;
18+
class PhiNode;
19+
class ThetaNode;
20+
}
21+
22+
namespace jlm::llvm
1223
{
1324

1425
/**
@@ -241,8 +252,8 @@ class LoadFromUndefTest final : public RvsdgTest
241252
}
242253

243254
private:
244-
jlm::rvsdg::LambdaNode * Lambda_;
245-
rvsdg::Node * UndefValueNode_;
255+
jlm::rvsdg::LambdaNode * Lambda_{};
256+
rvsdg::Node * UndefValueNode_{};
246257
};
247258

248259
/** \brief GetElementPtrTest class
@@ -351,12 +362,12 @@ class Bits2PtrTest final : public RvsdgTest
351362
std::unique_ptr<jlm::llvm::RvsdgModule>
352363
SetupRvsdg() override;
353364

354-
jlm::rvsdg::LambdaNode * LambdaBits2Ptr_;
355-
jlm::rvsdg::LambdaNode * LambdaTest_;
365+
jlm::rvsdg::LambdaNode * LambdaBits2Ptr_{};
366+
jlm::rvsdg::LambdaNode * LambdaTest_{};
356367

357-
rvsdg::Node * BitsToPtrNode_;
368+
rvsdg::Node * BitsToPtrNode_{};
358369

359-
rvsdg::SimpleNode * CallNode_;
370+
rvsdg::SimpleNode * CallNode_{};
360371
};
361372

362373
/** \brief ConstantPointerNullTest class
@@ -438,8 +449,8 @@ class CallTest1 final : public RvsdgTest
438449
rvsdg::SimpleNode * alloca_z;
439450

440451
private:
441-
rvsdg::SimpleNode * CallF_;
442-
rvsdg::SimpleNode * CallG_;
452+
rvsdg::SimpleNode * CallF_{};
453+
rvsdg::SimpleNode * CallG_{};
443454
};
444455

445456
/** \brief CallTest2 class
@@ -511,11 +522,11 @@ class CallTest2 final : public RvsdgTest
511522
std::unique_ptr<jlm::llvm::RvsdgModule>
512523
SetupRvsdg() override;
513524

514-
rvsdg::SimpleNode * CallCreate1_;
515-
rvsdg::SimpleNode * CallCreate2_;
525+
rvsdg::SimpleNode * CallCreate1_{};
526+
rvsdg::SimpleNode * CallCreate2_{};
516527

517-
rvsdg::SimpleNode * CallDestroy1_;
518-
rvsdg::SimpleNode * CallDestroy2_;
528+
rvsdg::SimpleNode * CallDestroy1_{};
529+
rvsdg::SimpleNode * CallDestroy2_{};
519530
};
520531

521532
/** \brief IndirectCallTest1 class
@@ -600,14 +611,14 @@ class IndirectCallTest1 final : public RvsdgTest
600611
std::unique_ptr<jlm::llvm::RvsdgModule>
601612
SetupRvsdg() override;
602613

603-
rvsdg::SimpleNode * CallIndcall_;
604-
rvsdg::SimpleNode * CallThree_;
605-
rvsdg::SimpleNode * CallFour_;
614+
rvsdg::SimpleNode * CallIndcall_{};
615+
rvsdg::SimpleNode * CallThree_{};
616+
rvsdg::SimpleNode * CallFour_{};
606617

607-
jlm::rvsdg::LambdaNode * LambdaThree_;
608-
jlm::rvsdg::LambdaNode * LambdaFour_;
609-
jlm::rvsdg::LambdaNode * LambdaIndcall_;
610-
jlm::rvsdg::LambdaNode * LambdaTest_;
618+
jlm::rvsdg::LambdaNode * LambdaThree_{};
619+
jlm::rvsdg::LambdaNode * LambdaFour_{};
620+
jlm::rvsdg::LambdaNode * LambdaIndcall_{};
621+
jlm::rvsdg::LambdaNode * LambdaTest_{};
611622
};
612623

613624
/** \brief IndirectCallTest2 class
@@ -787,27 +798,27 @@ class IndirectCallTest2 final : public RvsdgTest
787798
std::unique_ptr<jlm::llvm::RvsdgModule>
788799
SetupRvsdg() override;
789800

790-
jlm::rvsdg::DeltaNode * DeltaG1_;
791-
jlm::rvsdg::DeltaNode * DeltaG2_;
792-
793-
jlm::rvsdg::LambdaNode * LambdaThree_;
794-
jlm::rvsdg::LambdaNode * LambdaFour_;
795-
jlm::rvsdg::LambdaNode * LambdaI_;
796-
jlm::rvsdg::LambdaNode * LambdaX_;
797-
jlm::rvsdg::LambdaNode * LambdaY_;
798-
jlm::rvsdg::LambdaNode * LambdaTest_;
799-
jlm::rvsdg::LambdaNode * LambdaTest2_;
800-
801-
rvsdg::SimpleNode * IndirectCall_;
802-
rvsdg::SimpleNode * CallIWithThree_;
803-
rvsdg::SimpleNode * CallIWithFour_;
804-
rvsdg::SimpleNode * TestCallX_;
805-
rvsdg::SimpleNode * Test2CallX_;
806-
rvsdg::SimpleNode * CallY_;
807-
808-
jlm::rvsdg::SimpleNode * AllocaPx_;
809-
jlm::rvsdg::SimpleNode * AllocaPy_;
810-
jlm::rvsdg::SimpleNode * AllocaPz_;
801+
jlm::rvsdg::DeltaNode * DeltaG1_{};
802+
jlm::rvsdg::DeltaNode * DeltaG2_{};
803+
804+
jlm::rvsdg::LambdaNode * LambdaThree_{};
805+
jlm::rvsdg::LambdaNode * LambdaFour_{};
806+
jlm::rvsdg::LambdaNode * LambdaI_{};
807+
jlm::rvsdg::LambdaNode * LambdaX_{};
808+
jlm::rvsdg::LambdaNode * LambdaY_{};
809+
jlm::rvsdg::LambdaNode * LambdaTest_{};
810+
jlm::rvsdg::LambdaNode * LambdaTest2_{};
811+
812+
rvsdg::SimpleNode * IndirectCall_{};
813+
rvsdg::SimpleNode * CallIWithThree_{};
814+
rvsdg::SimpleNode * CallIWithFour_{};
815+
rvsdg::SimpleNode * TestCallX_{};
816+
rvsdg::SimpleNode * Test2CallX_{};
817+
rvsdg::SimpleNode * CallY_{};
818+
819+
jlm::rvsdg::SimpleNode * AllocaPx_{};
820+
jlm::rvsdg::SimpleNode * AllocaPy_{};
821+
jlm::rvsdg::SimpleNode * AllocaPz_{};
811822
};
812823

813824
/**
@@ -852,11 +863,11 @@ class ExternalCallTest1 final : public RvsdgTest
852863
std::unique_ptr<jlm::llvm::RvsdgModule>
853864
SetupRvsdg() override;
854865

855-
jlm::rvsdg::LambdaNode * LambdaF_;
866+
jlm::rvsdg::LambdaNode * LambdaF_{};
856867

857-
rvsdg::SimpleNode * CallG_;
868+
rvsdg::SimpleNode * CallG_{};
858869

859-
jlm::rvsdg::GraphImport * ExternalGArgument_;
870+
jlm::rvsdg::GraphImport * ExternalGArgument_{};
860871
};
861872

862873
/**
@@ -1077,20 +1088,20 @@ class GammaTest2 final : public RvsdgTest
10771088
std::unique_ptr<llvm::RvsdgModule>
10781089
SetupRvsdg() override;
10791090

1080-
rvsdg::LambdaNode * LambdaF_;
1081-
rvsdg::LambdaNode * LambdaG_;
1082-
rvsdg::LambdaNode * LambdaH_;
1091+
rvsdg::LambdaNode * LambdaF_{};
1092+
rvsdg::LambdaNode * LambdaG_{};
1093+
rvsdg::LambdaNode * LambdaH_{};
10831094

1084-
rvsdg::GammaNode * Gamma_;
1095+
rvsdg::GammaNode * Gamma_{};
10851096

1086-
rvsdg::SimpleNode * CallFromG_;
1087-
rvsdg::SimpleNode * CallFromH_;
1097+
rvsdg::SimpleNode * CallFromG_{};
1098+
rvsdg::SimpleNode * CallFromH_{};
10881099

1089-
rvsdg::Node * AllocaXFromG_;
1090-
rvsdg::Node * AllocaYFromG_;
1091-
rvsdg::Node * AllocaXFromH_;
1092-
rvsdg::Node * AllocaYFromH_;
1093-
rvsdg::Node * AllocaZ_;
1100+
rvsdg::Node * AllocaXFromG_{};
1101+
rvsdg::Node * AllocaYFromG_{};
1102+
rvsdg::Node * AllocaXFromH_{};
1103+
rvsdg::Node * AllocaYFromH_{};
1104+
rvsdg::Node * AllocaZ_{};
10941105
};
10951106

10961107
/** \brief ThetaTest class
@@ -1166,7 +1177,7 @@ class DeltaTest1 final : public RvsdgTest
11661177
std::unique_ptr<jlm::llvm::RvsdgModule>
11671178
SetupRvsdg() override;
11681179

1169-
rvsdg::SimpleNode * CallG_;
1180+
rvsdg::SimpleNode * CallG_{};
11701181
};
11711182

11721183
/** \brief DeltaTest2 class
@@ -1214,7 +1225,7 @@ class DeltaTest2 final : public RvsdgTest
12141225
std::unique_ptr<jlm::llvm::RvsdgModule>
12151226
SetupRvsdg() override;
12161227

1217-
rvsdg::SimpleNode * CallF1_;
1228+
rvsdg::SimpleNode * CallF1_{};
12181229
};
12191230

12201231
/** \brief DeltaTest3 class
@@ -1279,13 +1290,13 @@ class DeltaTest3 final : public RvsdgTest
12791290
std::unique_ptr<jlm::llvm::RvsdgModule>
12801291
SetupRvsdg() override;
12811292

1282-
jlm::rvsdg::LambdaNode * LambdaF_;
1283-
jlm::rvsdg::LambdaNode * LambdaTest_;
1293+
jlm::rvsdg::LambdaNode * LambdaF_{};
1294+
jlm::rvsdg::LambdaNode * LambdaTest_{};
12841295

1285-
jlm::rvsdg::DeltaNode * DeltaG1_;
1286-
jlm::rvsdg::DeltaNode * DeltaG2_;
1296+
jlm::rvsdg::DeltaNode * DeltaG1_{};
1297+
jlm::rvsdg::DeltaNode * DeltaG2_{};
12871298

1288-
rvsdg::SimpleNode * CallF_;
1299+
rvsdg::SimpleNode * CallF_{};
12891300
};
12901301

12911302
/** \brief ImportTest class
@@ -1333,7 +1344,7 @@ class ImportTest final : public RvsdgTest
13331344
std::unique_ptr<jlm::llvm::RvsdgModule>
13341345
SetupRvsdg() override;
13351346

1336-
rvsdg::SimpleNode * CallF1_;
1347+
rvsdg::SimpleNode * CallF1_{};
13371348
};
13381349

13391350
/** \brief PhiTest1 class
@@ -1401,10 +1412,10 @@ class PhiTest1 final : public RvsdgTest
14011412
std::unique_ptr<jlm::llvm::RvsdgModule>
14021413
SetupRvsdg() override;
14031414

1404-
rvsdg::SimpleNode * CallFibm1_;
1405-
rvsdg::SimpleNode * CallFibm2_;
1415+
rvsdg::SimpleNode * CallFibm1_{};
1416+
rvsdg::SimpleNode * CallFibm2_{};
14061417

1407-
rvsdg::SimpleNode * CallFib_;
1418+
rvsdg::SimpleNode * CallFib_{};
14081419
};
14091420

14101421
/** \brief PhiTest2 class
@@ -1605,28 +1616,28 @@ class PhiTest2 final : public RvsdgTest
16051616
std::unique_ptr<jlm::llvm::RvsdgModule>
16061617
SetupRvsdg() override;
16071618

1608-
jlm::rvsdg::LambdaNode * LambdaEight_;
1609-
jlm::rvsdg::LambdaNode * LambdaI_;
1610-
jlm::rvsdg::LambdaNode * LambdaA_;
1611-
jlm::rvsdg::LambdaNode * LambdaB_;
1612-
jlm::rvsdg::LambdaNode * LambdaC_;
1613-
jlm::rvsdg::LambdaNode * LambdaD_;
1614-
jlm::rvsdg::LambdaNode * LambdaTest_;
1615-
1616-
rvsdg::SimpleNode * CallAFromTest_;
1617-
rvsdg::SimpleNode * CallAFromC_;
1618-
rvsdg::SimpleNode * CallAFromD_;
1619-
rvsdg::SimpleNode * CallB_;
1620-
rvsdg::SimpleNode * CallC_;
1621-
rvsdg::SimpleNode * CallD_;
1622-
rvsdg::SimpleNode * CallI_;
1623-
rvsdg::SimpleNode * IndirectCall_;
1624-
1625-
jlm::rvsdg::SimpleNode * PTestAlloca_;
1626-
jlm::rvsdg::SimpleNode * PaAlloca_;
1627-
jlm::rvsdg::SimpleNode * PbAlloca_;
1628-
jlm::rvsdg::SimpleNode * PcAlloca_;
1629-
jlm::rvsdg::SimpleNode * PdAlloca_;
1619+
jlm::rvsdg::LambdaNode * LambdaEight_{};
1620+
jlm::rvsdg::LambdaNode * LambdaI_{};
1621+
jlm::rvsdg::LambdaNode * LambdaA_{};
1622+
jlm::rvsdg::LambdaNode * LambdaB_{};
1623+
jlm::rvsdg::LambdaNode * LambdaC_{};
1624+
jlm::rvsdg::LambdaNode * LambdaD_{};
1625+
jlm::rvsdg::LambdaNode * LambdaTest_{};
1626+
1627+
rvsdg::SimpleNode * CallAFromTest_{};
1628+
rvsdg::SimpleNode * CallAFromC_{};
1629+
rvsdg::SimpleNode * CallAFromD_{};
1630+
rvsdg::SimpleNode * CallB_{};
1631+
rvsdg::SimpleNode * CallC_{};
1632+
rvsdg::SimpleNode * CallD_{};
1633+
rvsdg::SimpleNode * CallI_{};
1634+
rvsdg::SimpleNode * IndirectCall_{};
1635+
1636+
jlm::rvsdg::SimpleNode * PTestAlloca_{};
1637+
jlm::rvsdg::SimpleNode * PaAlloca_{};
1638+
jlm::rvsdg::SimpleNode * PbAlloca_{};
1639+
jlm::rvsdg::SimpleNode * PcAlloca_{};
1640+
jlm::rvsdg::SimpleNode * PdAlloca_{};
16301641
};
16311642

16321643
/**
@@ -1886,15 +1897,15 @@ class MemcpyTest final : public RvsdgTest
18861897
std::unique_ptr<jlm::llvm::RvsdgModule>
18871898
SetupRvsdg() override;
18881899

1889-
jlm::rvsdg::LambdaNode * LambdaF_;
1890-
jlm::rvsdg::LambdaNode * LambdaG_;
1900+
jlm::rvsdg::LambdaNode * LambdaF_{};
1901+
jlm::rvsdg::LambdaNode * LambdaG_{};
18911902

1892-
jlm::rvsdg::DeltaNode * LocalArray_;
1893-
jlm::rvsdg::DeltaNode * GlobalArray_;
1903+
jlm::rvsdg::DeltaNode * LocalArray_{};
1904+
jlm::rvsdg::DeltaNode * GlobalArray_{};
18941905

1895-
rvsdg::SimpleNode * CallF_;
1906+
rvsdg::SimpleNode * CallF_{};
18961907

1897-
rvsdg::SimpleNode * Memcpy_;
1908+
rvsdg::SimpleNode * Memcpy_{};
18981909
};
18991910

19001911
/**
@@ -2070,11 +2081,11 @@ class LinkedListTest final : public RvsdgTest
20702081
std::unique_ptr<jlm::llvm::RvsdgModule>
20712082
SetupRvsdg() override;
20722083

2073-
jlm::rvsdg::DeltaNode * DeltaMyList_;
2084+
jlm::rvsdg::DeltaNode * DeltaMyList_{};
20742085

2075-
jlm::rvsdg::LambdaNode * LambdaNext_;
2086+
jlm::rvsdg::LambdaNode * LambdaNext_{};
20762087

2077-
rvsdg::SimpleNode * Alloca_;
2088+
rvsdg::SimpleNode * Alloca_{};
20782089
};
20792090

20802091
/** \brief RVSDG module with one of each memory node type.
@@ -2397,7 +2408,7 @@ class FreeNullTest final : public RvsdgTest
23972408
std::unique_ptr<llvm::RvsdgModule>
23982409
SetupRvsdg() override;
23992410

2400-
rvsdg::LambdaNode * LambdaMain_;
2411+
rvsdg::LambdaNode * LambdaMain_{};
24012412
};
24022413

24032414
/**
@@ -2543,3 +2554,5 @@ class VariadicFunctionTest2 final : public RvsdgTest
25432554
};
25442555

25452556
}
2557+
2558+
#endif

0 commit comments

Comments
 (0)