derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons,misc: Portable debug flag generation (#1666)

Browse Source 
Modifies union construction in the debug directory so output is more
amenable to alternative compilers. Verified that this change produces
code that builds with clang, gcc, msvc, nvhpc, aocc, icc, openxl, and
cray hpc.

These were the kinds of errors seen in MSVC, which this patch fixes.
```
debug/Decoder.hh(24): error C2461: 'gem5::debug::unions::Decoder': constructor syntax missing formal parameters
debug/Decoder.hh(31): error C7624: Type name 'gem5::debug::unions::Decoder' cannot appear on the right side of a class member access expression
```
This commit is contained in:
Mahesh Madhav
2024-10-18 14:39:09 -07:00
committed by GitHub
parent b836a3f239
commit 3e83f3ce4f
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build_tools/debugflaghh.py
View File

@@ -100,13 +100,16 @@ if components:
inline union ${{args.name}} inline union ${{args.name}}
{ {
~${{args.name}}() {} ~${{args.name}}() {}
CompoundFlag ${{args.name}} = {
"${{args.name}}", "${{args.desc}}", { CompoundFlag flag${{args.name}};
${{args.name}}() : flag${{args.name}}("${{args.name}}", "${{args.desc}}",
{
${{",\\n ".join( ${{",\\n ".join(
f"(Flag *)&::gem5::debug::{flag}" for flag in components)}} f"(Flag *)&::gem5::debug::{flag}" for flag in components)}}
} }) {}
};
} ${{args.name}}; } instance${{args.name}};
""" """
) )
else: else:
@@ -115,10 +118,11 @@ else:
inline union ${{args.name}} inline union ${{args.name}}
{ {
~${{args.name}}() {} ~${{args.name}}() {}
SimpleFlag ${{args.name}} = { SimpleFlag flag${{args.name}};
"${{args.name}}", "${{args.desc}}", ${{"true" if fmt else "false"}}
}; ${{args.name}}() : flag${{args.name}}("${{args.name}}", "${{args.desc}}", ${{"true" if fmt else "false"}}) {}
} ${{args.name}};
} instance${{args.name}};
""" """
) )
@@ -127,7 +131,7 @@ code(
} // namespace unions } // namespace unions
inline constexpr const auto& ${{args.name}} = inline constexpr const auto& ${{args.name}} =
::gem5::debug::unions::${{args.name}}.${{args.name}}; ::gem5::debug::unions::instance${{args.name}}.flag${{args.name}};
} // namespace debug } // namespace debug
} // namespace gem5 } // namespace gem5