Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45741 )
Change subject: cpu: Make some compiler guards consistent with the other
files.
......................................................................
cpu: Make some compiler guards consistent with the other files.
Change-Id: I9dd007ad4ea0e1ff93677333a2f5e1f9b5d2a8fa
---
M src/cpu/pred/ltage.hh
M src/cpu/pred/statistical_corrector.hh
M src/cpu/pred/tage.hh
M src/cpu/pred/tage_base.hh
M src/cpu/pred/tage_sc_l.hh
M src/cpu/pred/tage_sc_l_64KB.hh
M src/cpu/pred/tage_sc_l_8KB.hh
7 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/cpu/pred/ltage.hh b/src/cpu/pred/ltage.hh
index 8e8d428..95139b7 100644
--- a/src/cpu/pred/ltage.hh
+++ b/src/cpu/pred/ltage.hh
@@ -46,8 +46,8 @@
* one that predicted when the prediction is incorrect.
*/
-#ifndef __CPU_PRED_LTAGE
-#define __CPU_PRED_LTAGE
+#ifndef __CPU_PRED_LTAGE_HH__
+#define __CPU_PRED_LTAGE_HH__
#include <vector>
@@ -109,4 +109,4 @@
ThreadID tid, Addr branch_pc, bool cond_branch, void* &b) override;
};
-#endif // __CPU_PRED_LTAGE
+#endif // __CPU_PRED_LTAGE_HH__
diff --git a/src/cpu/pred/statistical_corrector.hh
b/src/cpu/pred/statistical_corrector.hh
index c36a168..1175568 100644
--- a/src/cpu/pred/statistical_corrector.hh
+++ b/src/cpu/pred/statistical_corrector.hh
@@ -39,8 +39,8 @@
* Statistical corrector base class
*/
-#ifndef __CPU_PRED_STATISTICAL_CORRECTOR_HH
-#define __CPU_PRED_STATISTICAL_CORRECTOR_HH
+#ifndef __CPU_PRED_STATISTICAL_CORRECTOR_HH__
+#define __CPU_PRED_STATISTICAL_CORRECTOR_HH__
#include "base/statistics.hh"
#include "base/types.hh"
@@ -273,4 +273,4 @@
virtual size_t getSizeInBits() const;
};
-#endif//__CPU_PRED_STATISTICAL_CORRECTOR_HH
+#endif//__CPU_PRED_STATISTICAL_CORRECTOR_HH__
diff --git a/src/cpu/pred/tage.hh b/src/cpu/pred/tage.hh
index 71ee4ac5..ec4fce9 100644
--- a/src/cpu/pred/tage.hh
+++ b/src/cpu/pred/tage.hh
@@ -45,8 +45,8 @@
* one that predicted when the prediction is incorrect.
*/
-#ifndef __CPU_PRED_TAGE
-#define __CPU_PRED_TAGE
+#ifndef __CPU_PRED_TAGE_HH__
+#define __CPU_PRED_TAGE_HH__
#include <vector>
@@ -90,4 +90,4 @@
virtual void squash(ThreadID tid, void *bp_history) override;
};
-#endif // __CPU_PRED_TAGE
+#endif // __CPU_PRED_TAGE_HH__
diff --git a/src/cpu/pred/tage_base.hh b/src/cpu/pred/tage_base.hh
index 4199299..e79fac3 100644
--- a/src/cpu/pred/tage_base.hh
+++ b/src/cpu/pred/tage_base.hh
@@ -45,8 +45,8 @@
* one that predicted when the prediction is incorrect.
*/
-#ifndef __CPU_PRED_TAGE_BASE
-#define __CPU_PRED_TAGE_BASE
+#ifndef __CPU_PRED_TAGE_BASE_HH__
+#define __CPU_PRED_TAGE_BASE_HH__
#include <vector>
@@ -505,4 +505,4 @@
} stats;
};
-#endif // __CPU_PRED_TAGE_BASE
+#endif // __CPU_PRED_TAGE_BASE_HH__
diff --git a/src/cpu/pred/tage_sc_l.hh b/src/cpu/pred/tage_sc_l.hh
index 10e3c1f..6691928 100644
--- a/src/cpu/pred/tage_sc_l.hh
+++ b/src/cpu/pred/tage_sc_l.hh
@@ -40,8 +40,8 @@
* It consits of a TAGE + a statistical corrector (SC) + a loop predictor
(L)
*/
-#ifndef __CPU_PRED_TAGE_SC_L
-#define __CPU_PRED_TAGE_SC_L
+#ifndef __CPU_PRED_TAGE_SC_L_HH__
+#define __CPU_PRED_TAGE_SC_L_HH__
#include "cpu/pred/ltage.hh"
#include "cpu/pred/statistical_corrector.hh"
@@ -185,5 +185,4 @@
};
-#endif // __CPU_PRED_TAGE_SC_L
-
+#endif // __CPU_PRED_TAGE_SC_L_HH__
diff --git a/src/cpu/pred/tage_sc_l_64KB.hh b/src/cpu/pred/tage_sc_l_64KB.hh
index 87b49be..00bc896 100644
--- a/src/cpu/pred/tage_sc_l_64KB.hh
+++ b/src/cpu/pred/tage_sc_l_64KB.hh
@@ -42,8 +42,8 @@
* http://www.jilp.org/cbp2016/code/AndreSeznecLimited.tar.gz
*/
-#ifndef __CPU_PRED_TAGE_SC_L_64KB
-#define __CPU_PRED_TAGE_SC_L_64KB
+#ifndef __CPU_PRED_TAGE_SC_L_64KB_HH__
+#define __CPU_PRED_TAGE_SC_L_64KB_HH__
#include "cpu/pred/tage_sc_l.hh"
#include "params/TAGE_SC_L_64KB.hh"
@@ -132,5 +132,4 @@
TAGE_SC_L_64KB(const TAGE_SC_L_64KBParams ¶ms);
};
-#endif // __CPU_PRED_TAGE_SC_L_64KB
-
+#endif // __CPU_PRED_TAGE_SC_L_64KB_HH__
diff --git a/src/cpu/pred/tage_sc_l_8KB.hh b/src/cpu/pred/tage_sc_l_8KB.hh
index 2cabbca..fe249de 100644
--- a/src/cpu/pred/tage_sc_l_8KB.hh
+++ b/src/cpu/pred/tage_sc_l_8KB.hh
@@ -39,8 +39,8 @@
* 8KB TAGE-SC-L branch predictor (devised by Andre Seznec)
*/
-#ifndef __CPU_PRED_TAGE_SC_L_8KB
-#define __CPU_PRED_TAGE_SC_L_8KB
+#ifndef __CPU_PRED_TAGE_SC_L_8KB_HH__
+#define __CPU_PRED_TAGE_SC_L_8KB_HH__
#include "cpu/pred/tage_sc_l.hh"
#include "params/TAGE_SC_L_8KB.hh"
@@ -112,5 +112,4 @@
TAGE_SC_L_8KB(const TAGE_SC_L_8KBParams ¶ms);
};
-#endif // __CPU_PRED_TAGE_SC_L_8KB
-
+#endif // __CPU_PRED_TAGE_SC_L_8KB_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45741
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9dd007ad4ea0e1ff93677333a2f5e1f9b5d2a8fa
Gerrit-Change-Number: 45741
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
