[llvm-mca] Move llvm-mca library to llvm/lib/MCA. · llvm/llvm-project@cc5e6a7 (original) (raw)

Skip to content

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Appearance settings

Commit cc5e6a7

[llvm-mca] Move llvm-mca library to llvm/lib/MCA.

Summary: See PR38731. Reviewers: andreadb Subscribers: mgorny, javed.absar, tschuett, gbedwell, andreadb, RKSimon, llvm-commits Differential Revision: https://reviews.llvm.org/D55557llvm-svn: 349332

File tree

48 files changed

lines changed

48 files changed

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ D: Loop Strength Reduction, Register allocators
71 71 N: Andrea Di Biagio
72 72 E: andrea.dibiagio@sony.com
73 73 E: andrea.dibiagio@gmail.com
74 -D: llvm-mca
74 +D: MCA, llvm-mca
75 75
76 76 N: Duncan P. N. Exon Smith
77 77 E: dexonsmith@apple.com

Lines changed: 8 additions & 7 deletions

Original file line number Diff line number Diff line change
@@ -15,14 +15,15 @@
15 15 ///
16 16 //===----------------------------------------------------------------------===//
17 17
18 -#ifndef LLVM_TOOLS_LLVM_MCA_CONTEXT_H
19 -#define LLVM_TOOLS_LLVM_MCA_CONTEXT_H
20 -#include "HardwareUnits/HardwareUnit.h"
21 -#include "InstrBuilder.h"
22 -#include "Pipeline.h"
23 -#include "SourceMgr.h"
18 +#ifndef LLVM_MCA_CONTEXT_H
19 +#define LLVM_MCA_CONTEXT_H
20 +
24 21 #include "llvm/MC/MCRegisterInfo.h"
25 22 #include "llvm/MC/MCSubtargetInfo.h"
23 +#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
24 +#include "llvm/MCA/InstrBuilder.h"
25 +#include "llvm/MCA/Pipeline.h"
26 +#include "llvm/MCA/SourceMgr.h"
26 27 #include <memory>
27 28
28 29 namespace llvm {
@@ -65,4 +66,4 @@ class Context {
65 66
66 67 } // namespace mca
67 68 } // namespace llvm
68 -#endif // LLVM_TOOLS_LLVM_MCA_CONTEXT_H
69 +#endif // LLVM_MCA_CONTEXT_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@
12 12 ///
13 13 //===----------------------------------------------------------------------===//
14 14
15 -#ifndef LLVM_TOOLS_LLVM_MCA_HWEVENTLISTENER_H
16 -#define LLVM_TOOLS_LLVM_MCA_HWEVENTLISTENER_H
15 +#ifndef LLVM_MCA_HWEVENTLISTENER_H
16 +#define LLVM_MCA_HWEVENTLISTENER_H
17 17
18 -#include "Instruction.h"
19 -#include "Support.h"
20 18 #include "llvm/ADT/ArrayRef.h"
19 +#include "llvm/MCA/Instruction.h"
20 +#include "llvm/MCA/Support.h"
21 21
22 22 namespace llvm {
23 23 namespace mca {
@@ -153,4 +153,4 @@ class HWEventListener {
153 153 } // namespace mca
154 154 } // namespace llvm
155 155
156 -#endif
156 +#endif // LLVM_MCA_HWEVENTLISTENER_H

Lines changed: 3 additions & 3 deletions

Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_HARDWAREUNIT_H
17 -#define LLVM_TOOLS_LLVM_MCA_HARDWAREUNIT_H
16 +#ifndef LLVM_MCA_HARDWAREUNIT_H
17 +#define LLVM_MCA_HARDWAREUNIT_H
18 18
19 19 namespace llvm {
20 20 namespace mca {
@@ -30,4 +30,4 @@ class HardwareUnit {
30 30
31 31 } // namespace mca
32 32 } // namespace llvm
33 -#endif // LLVM_TOOLS_LLVM_MCA_HARDWAREUNIT_H
33 +#endif // LLVM_MCA_HARDWAREUNIT_H

Lines changed: 4 additions & 4 deletions

Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_LSUNIT_H
17 -#define LLVM_TOOLS_LLVM_MCA_LSUNIT_H
16 +#ifndef LLVM_MCA_LSUNIT_H
17 +#define LLVM_MCA_LSUNIT_H
18 18
19 -#include "HardwareUnits/HardwareUnit.h"
20 19 #include "llvm/ADT/SmallSet.h"
21 20 #include "llvm/MC/MCSchedule.h"
21 +#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
22 22
23 23 namespace llvm {
24 24 namespace mca {
@@ -204,4 +204,4 @@ class LSUnit : public HardwareUnit {
204 204 } // namespace mca
205 205 } // namespace llvm
206 206
207 -#endif
207 +#endif // LLVM_MCA_LSUNIT_H

Lines changed: 4 additions & 4 deletions

Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@
14 14 ///
15 15 //===----------------------------------------------------------------------===//
16 16
17 -#ifndef LLVM_TOOLS_LLVM_MCA_REGISTER_FILE_H
18 -#define LLVM_TOOLS_LLVM_MCA_REGISTER_FILE_H
17 +#ifndef LLVM_MCA_REGISTER_FILE_H
18 +#define LLVM_MCA_REGISTER_FILE_H
19 19
20 -#include "HardwareUnits/HardwareUnit.h"
21 20 #include "llvm/ADT/APInt.h"
22 21 #include "llvm/ADT/SmallVector.h"
23 22 #include "llvm/MC/MCRegisterInfo.h"
24 23 #include "llvm/MC/MCSchedule.h"
24 +#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
25 25 #include "llvm/Support/Error.h"
26 26
27 27 namespace llvm {
@@ -236,4 +236,4 @@ class RegisterFile : public HardwareUnit {
236 236 } // namespace mca
237 237 } // namespace llvm
238 238
239 -#endif // LLVM_TOOLS_LLVM_MCA_REGISTER_FILE_H
239 +#endif // LLVM_MCA_REGISTER_FILE_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -13,15 +13,15 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_RESOURCE_MANAGER_H
17 -#define LLVM_TOOLS_LLVM_MCA_RESOURCE_MANAGER_H
16 +#ifndef LLVM_MCA_RESOURCE_MANAGER_H
17 +#define LLVM_MCA_RESOURCE_MANAGER_H
18 18
19 -#include "Instruction.h"
20 -#include "Support.h"
21 19 #include "llvm/ADT/ArrayRef.h"
22 20 #include "llvm/ADT/DenseMap.h"
23 21 #include "llvm/ADT/SmallVector.h"
24 22 #include "llvm/MC/MCSchedule.h"
23 +#include "llvm/MCA/Instruction.h"
24 +#include "llvm/MCA/Support.h"
25 25
26 26 namespace llvm {
27 27 namespace mca {
@@ -357,4 +357,4 @@ class ResourceManager {
357 357 } // namespace mca
358 358 } // namespace llvm
359 359
360 -#endif // LLVM_TOOLS_LLVM_MCA_RESOURCE_MANAGER_H
360 +#endif // LLVM_MCA_RESOURCE_MANAGER_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@
12 12 ///
13 13 //===----------------------------------------------------------------------===//
14 14
15 -#ifndef LLVM_TOOLS_LLVM_MCA_RETIRE_CONTROL_UNIT_H
16 -#define LLVM_TOOLS_LLVM_MCA_RETIRE_CONTROL_UNIT_H
15 +#ifndef LLVM_MCA_RETIRE_CONTROL_UNIT_H
16 +#define LLVM_MCA_RETIRE_CONTROL_UNIT_H
17 17
18 -#include "HardwareUnits/HardwareUnit.h"
19 -#include "Instruction.h"
20 18 #include "llvm/MC/MCSchedule.h"
19 +#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
20 +#include "llvm/MCA/Instruction.h"
21 21 #include <vector>
22 22
23 23 namespace llvm {
@@ -101,4 +101,4 @@ struct RetireControlUnit : public HardwareUnit {
101 101 } // namespace mca
102 102 } // namespace llvm
103 103
104 -#endif // LLVM_TOOLS_LLVM_MCA_RETIRE_CONTROL_UNIT_H
104 +#endif // LLVM_MCA_RETIRE_CONTROL_UNIT_H

Lines changed: 7 additions & 7 deletions

Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@
12 12 ///
13 13 //===----------------------------------------------------------------------===//
14 14
15 -#ifndef LLVM_TOOLS_LLVM_MCA_SCHEDULER_H
16 -#define LLVM_TOOLS_LLVM_MCA_SCHEDULER_H
15 +#ifndef LLVM_MCA_SCHEDULER_H
16 +#define LLVM_MCA_SCHEDULER_H
17 17
18 -#include "HardwareUnits/HardwareUnit.h"
19 -#include "HardwareUnits/LSUnit.h"
20 -#include "ResourceManager.h"
21 -#include "Support.h"
22 18 #include "llvm/ADT/SmallVector.h"
23 19 #include "llvm/MC/MCSchedule.h"
20 +#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
21 +#include "llvm/MCA/HardwareUnits/LSUnit.h"
22 +#include "llvm/MCA/HardwareUnits/ResourceManager.h"
23 +#include "llvm/MCA/Support.h"
24 24
25 25 namespace llvm {
26 26 namespace mca {
@@ -211,4 +211,4 @@ class Scheduler : public HardwareUnit {
211 211 } // namespace mca
212 212 } // namespace llvm
213 213
214 -#endif // LLVM_TOOLS_LLVM_MCA_SCHEDULER_H
214 +#endif // LLVM_MCA_SCHEDULER_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@
12 12 //
13 13 //===----------------------------------------------------------------------===//
14 14
15 -#ifndef LLVM_TOOLS_LLVM_MCA_INSTRBUILDER_H
16 -#define LLVM_TOOLS_LLVM_MCA_INSTRBUILDER_H
15 +#ifndef LLVM_MCA_INSTRBUILDER_H
16 +#define LLVM_MCA_INSTRBUILDER_H
17 17
18 -#include "Instruction.h"
19 -#include "Support.h"
20 18 #include "llvm/MC/MCInstrAnalysis.h"
21 19 #include "llvm/MC/MCInstrInfo.h"
22 20 #include "llvm/MC/MCRegisterInfo.h"
23 21 #include "llvm/MC/MCSubtargetInfo.h"
22 +#include "llvm/MCA/Instruction.h"
23 +#include "llvm/MCA/Support.h"
24 24 #include "llvm/Support/Error.h"
25 25
26 26 namespace llvm {
@@ -74,4 +74,4 @@ class InstrBuilder {
74 74 } // namespace mca
75 75 } // namespace llvm
76 76
77 -#endif
77 +#endif // LLVM_MCA_INSTRBUILDER_H

Lines changed: 3 additions & 3 deletions

Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_INSTRUCTION_H
17 -#define LLVM_TOOLS_LLVM_MCA_INSTRUCTION_H
16 +#ifndef LLVM_MCA_INSTRUCTION_H
17 +#define LLVM_MCA_INSTRUCTION_H
18 18
19 19 #include "llvm/ADT/ArrayRef.h"
20 20 #include "llvm/ADT/STLExtras.h"
@@ -539,4 +539,4 @@ class WriteRef {
539 539 } // namespace mca
540 540 } // namespace llvm
541 541
542 -#endif
542 +#endif // LLVM_MCA_INSTRUCTION_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_PIPELINE_H
17 -#define LLVM_TOOLS_LLVM_MCA_PIPELINE_H
16 +#ifndef LLVM_MCA_PIPELINE_H
17 +#define LLVM_MCA_PIPELINE_H
18 18
19 -#include "HardwareUnits/Scheduler.h"
20 -#include "Stages/Stage.h"
21 19 #include "llvm/ADT/SmallVector.h"
20 +#include "llvm/MCA/HardwareUnits/Scheduler.h"
21 +#include "llvm/MCA/Stages/Stage.h"
22 22 #include "llvm/Support/Error.h"
23 23
24 24 namespace llvm {
@@ -76,4 +76,4 @@ class Pipeline {
76 76 } // namespace mca
77 77 } // namespace llvm
78 78
79 -#endif // LLVM_TOOLS_LLVM_MCA_PIPELINE_H
79 +#endif // LLVM_MCA_PIPELINE_H

Lines changed: 3 additions & 3 deletions

Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
13 13 ///
14 14 //===----------------------------------------------------------------------===//
15 15
16 -#ifndef LLVM_TOOLS_LLVM_MCA_SOURCEMGR_H
17 -#define LLVM_TOOLS_LLVM_MCA_SOURCEMGR_H
16 +#ifndef LLVM_MCA_SOURCEMGR_H
17 +#define LLVM_MCA_SOURCEMGR_H
18 18
19 19 #include "llvm/ADT/ArrayRef.h"
20 20
@@ -54,4 +54,4 @@ class SourceMgr {
54 54 } // namespace mca
55 55 } // namespace llvm
56 56
57 -#endif
57 +#endif // LLVM_MCA_SOURCEMGR_H

Lines changed: 8 additions & 8 deletions

Original file line number Diff line number Diff line change
@@ -16,16 +16,16 @@
16 16 ///
17 17 //===----------------------------------------------------------------------===//
18 18
19 -#ifndef LLVM_TOOLS_LLVM_MCA_DISPATCH_STAGE_H
20 -#define LLVM_TOOLS_LLVM_MCA_DISPATCH_STAGE_H
19 +#ifndef LLVM_MCA_DISPATCH_STAGE_H
20 +#define LLVM_MCA_DISPATCH_STAGE_H
21 21
22 -#include "HWEventListener.h"
23 -#include "HardwareUnits/RegisterFile.h"
24 -#include "HardwareUnits/RetireControlUnit.h"
25 -#include "Instruction.h"
26 -#include "Stages/Stage.h"
27 22 #include "llvm/MC/MCRegisterInfo.h"
28 23 #include "llvm/MC/MCSubtargetInfo.h"
24 +#include "llvm/MCA/HWEventListener.h"
25 +#include "llvm/MCA/HardwareUnits/RegisterFile.h"
26 +#include "llvm/MCA/HardwareUnits/RetireControlUnit.h"
27 +#include "llvm/MCA/Instruction.h"
28 +#include "llvm/MCA/Stages/Stage.h"
29 29
30 30 namespace llvm {
31 31 namespace mca {
@@ -90,4 +90,4 @@ class DispatchStage final : public Stage {
90 90 } // namespace mca
91 91 } // namespace llvm
92 92
93 -#endif // LLVM_TOOLS_LLVM_MCA_DISPATCH_STAGE_H
93 +#endif // LLVM_MCA_DISPATCH_STAGE_H

Lines changed: 5 additions & 5 deletions

Original file line number Diff line number Diff line change
@@ -14,12 +14,12 @@
14 14 ///
15 15 //===----------------------------------------------------------------------===//
16 16
17 -#ifndef LLVM_TOOLS_LLVM_MCA_ENTRY_STAGE_H
18 -#define LLVM_TOOLS_LLVM_MCA_ENTRY_STAGE_H
17 +#ifndef LLVM_MCA_ENTRY_STAGE_H
18 +#define LLVM_MCA_ENTRY_STAGE_H
19 19
20 -#include "SourceMgr.h"
21 -#include "Stages/Stage.h"
22 20 #include "llvm/ADT/SmallVector.h"
21 +#include "llvm/MCA/SourceMgr.h"
22 +#include "llvm/MCA/Stages/Stage.h"
23 23
24 24 namespace llvm {
25 25 namespace mca {
@@ -49,4 +49,4 @@ class EntryStage final : public Stage {
49 49 } // namespace mca
50 50 } // namespace llvm
51 51
52 -#endif // LLVM_TOOLS_LLVM_MCA_FETCH_STAGE_H
52 +#endif // LLVM_MCA_FETCH_STAGE_H

Lines changed: 6 additions & 6 deletions

Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@
15 15 ///
16 16 //===----------------------------------------------------------------------===//
17 17
18 -#ifndef LLVM_TOOLS_LLVM_MCA_EXECUTE_STAGE_H
19 -#define LLVM_TOOLS_LLVM_MCA_EXECUTE_STAGE_H
18 +#ifndef LLVM_MCA_EXECUTE_STAGE_H
19 +#define LLVM_MCA_EXECUTE_STAGE_H
20 20
21 -#include "HardwareUnits/Scheduler.h"
22 -#include "Instruction.h"
23 -#include "Stages/Stage.h"
24 21 #include "llvm/ADT/ArrayRef.h"
22 +#include "llvm/MCA/HardwareUnits/Scheduler.h"
23 +#include "llvm/MCA/Instruction.h"
24 +#include "llvm/MCA/Stages/Stage.h"
25 25
26 26 namespace llvm {
27 27 namespace mca {
@@ -77,4 +77,4 @@ class ExecuteStage final : public Stage {
77 77 } // namespace mca
78 78 } // namespace llvm
79 79
80 -#endif // LLVM_TOOLS_LLVM_MCA_EXECUTE_STAGE_H
80 +#endif // LLVM_MCA_EXECUTE_STAGE_H

Lines changed: 6 additions & 6 deletions

Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@
14 14 ///
15 15 //===----------------------------------------------------------------------===//
16 16
17 -#ifndef LLVM_TOOLS_LLVM_MCA_INSTRUCTIONTABLES_H
18 -#define LLVM_TOOLS_LLVM_MCA_INSTRUCTIONTABLES_H
17 +#ifndef LLVM_MCA_INSTRUCTIONTABLES_H
18 +#define LLVM_MCA_INSTRUCTIONTABLES_H
19 19
20 -#include "HardwareUnits/Scheduler.h"
21 -#include "Stages/Stage.h"
22 -#include "Support.h"
23 20 #include "llvm/ADT/SmallVector.h"
24 21 #include "llvm/MC/MCSchedule.h"
22 +#include "llvm/MCA/HardwareUnits/Scheduler.h"
23 +#include "llvm/MCA/Stages/Stage.h"
24 +#include "llvm/MCA/Support.h"
25 25
26 26 namespace llvm {
27 27 namespace mca {
@@ -42,4 +42,4 @@ class InstructionTables final : public Stage {
42 42 } // namespace mca
43 43 } // namespace llvm
44 44
45 -#endif
45 +#endif // LLVM_MCA_INSTRUCTIONTABLES_H