Skip to content

Release 60 #12

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
merged 3 commits into from
Mar 30, 2018
Merged

Release 60 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e8a8f0
Enable new name generation for math intrinsic calls
vjayathirtha-nv Mar 14, 2018
3ab9f2b
1. Undo default IEEE setting.
vjayathirtha-nv Mar 15, 2018
2602d14
Link libpgmath library
vjayathirtha-nv Mar 26, 2018
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
2 changes: 2 additions & 0 deletions include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2913,6 +2913,8 @@ def no_fortran_main: Flag<["-"], "fno-fortran-main">, Group<gfortran_Group>,
HelpText<"Don't link in Fortran main">;
def Mnomain: Flag<["-"], "Mnomain">, Group<pgi_fortran_Group>,
HelpText<"Don't link in Fortran main">;
def frelaxed_math : Flag<["-"], "frelaxed-math">, Group<pgi_fortran_Group>,
HelpText<"Use relaxed Math intrinsic functions">;

// Flang internal debug options
def Mx_EQ : Joined<["-"], "Mx,">, Group<pgi_fortran_Group>;
Expand Down
1 change: 1 addition & 0 deletions lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,7 @@ void ToolChain::AddFortranStdlibLibArgs(const ArgList &Args,
}
CmdArgs.push_back("-lflang");
CmdArgs.push_back("-lflangrti");
CmdArgs.push_back("-lpgmath");
if( useOpenMP ) {
CmdArgs.push_back("-lomp");
}
Expand Down
139 changes: 77 additions & 62 deletions lib/Driver/ToolChains/Flang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
ArgStringList LowerCmdArgs;
SmallString<256> Stem;
std::string OutFile;
bool NeedIEEE = true;
bool NeedIEEE = false;
bool NeedFastMath = false;
bool NeedRelaxedMath = false;

// Check number of inputs for sanity. We need at least one input.
assert(Inputs.size() >= 1 && "Must have at least one input.");
Expand Down Expand Up @@ -76,55 +78,7 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,

/***** Process common args *****/

// Override IEEE mode if needed
if (Args.hasArg(options::OPT_Ofast) ||
Args.hasArg(options::OPT_ffast_math) ||
Args.hasArg(options::OPT_fno_fast_math) ||
Args.hasArg(options::OPT_Kieee_on) ||
Args.hasArg(options::OPT_Kieee_off)) {
auto A = Args.getLastArg(options::OPT_Ofast,
options::OPT_ffast_math,
options::OPT_fno_fast_math,
options::OPT_Kieee_on,
options::OPT_Kieee_off);
auto Opt = A->getOption();
if (Opt.matches(options::OPT_Ofast) ||
Opt.matches(options::OPT_ffast_math) ||
Opt.matches(options::OPT_Kieee_off)) {
NeedIEEE = false;
}
}

// -Kieee is on by default
if (!Args.hasArg(options::OPT_Kieee_off)) {
CommonCmdArgs.push_back("-y"); // Common: -y 129 2
CommonCmdArgs.push_back("129");
CommonCmdArgs.push_back("2");
// Lower: -x 6 0x100
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("6");
LowerCmdArgs.push_back("0x100");
// -x 42 0x400000
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("42");
LowerCmdArgs.push_back("0x400000");
// -y 129 4
LowerCmdArgs.push_back("-y");
LowerCmdArgs.push_back("129");
LowerCmdArgs.push_back("4");
// -x 129 0x400
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("129");
LowerCmdArgs.push_back("0x400");
for (auto Arg : Args.filtered(options::OPT_Kieee_on)) {
Arg->claim();
}
} else {
for (auto Arg : Args.filtered(options::OPT_Kieee_off)) {
Arg->claim();
}
}


// Add "inform level" flag
if (Args.hasArg(options::OPT_Minform_EQ)) {
// Parse arguments to set its value
Expand Down Expand Up @@ -506,22 +460,82 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
// pass -g to lower
LowerCmdArgs.push_back("-debug");
}

if (Arg *A = Args.getLastArg(options::OPT_ffast_math, options::OPT_fno_fast_math)) {
if (A->getOption().matches(options::OPT_ffast_math)) {
LowerCmdArgs.push_back("-x");
} else {
LowerCmdArgs.push_back("-y");

/* Pick the last among conflicting flags, if a positive and negative flag
exists for ex. "-ffast-math -fno-fast-math" they get nullified. Also any
previously overwritten flag remains that way.
For ex. "-Kieee -ffast-math -fno-fast-math". -Kieee gets overwritten by
-ffast-math which then gets negated by -fno-fast-math, finally behaving as
if none of those flags were passed.
*/
for(Arg *A: Args.filtered(options::OPT_ffast_math, options::OPT_fno_fast_math,
options::OPT_Ofast, options::OPT_Kieee_off,
options::OPT_Kieee_on, options::OPT_frelaxed_math)) {
if (A->getOption().matches(options::OPT_ffast_math) ||
A->getOption().matches(options::OPT_Ofast)) {
NeedIEEE = NeedRelaxedMath = false;
NeedFastMath = true;
} else if (A->getOption().matches(options::OPT_Kieee_on)) {
NeedFastMath = NeedRelaxedMath = false;
NeedIEEE = true;
} else if (A->getOption().matches(options::OPT_frelaxed_math)) {
NeedFastMath = NeedIEEE = false;
NeedRelaxedMath = true;
} else if (A->getOption().matches(options::OPT_fno_fast_math)) {
NeedFastMath = false;
} else if (A->getOption().matches(options::OPT_Kieee_off)) {
NeedIEEE = false;
}
LowerCmdArgs.push_back("216");
LowerCmdArgs.push_back("1");
A->claim();
}

// IEEE compatibility mode
LowerCmdArgs.push_back("-ieee");
if (NeedIEEE) {
if (NeedFastMath) {
// Lower: -x 216 1
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("216");
LowerCmdArgs.push_back("1");
} else {
// Lower: -ieee 0
LowerCmdArgs.push_back("-ieee");
LowerCmdArgs.push_back("0");
} else if (NeedIEEE) {
// Common: -y 129 2
CommonCmdArgs.push_back("-y");
CommonCmdArgs.push_back("129");
CommonCmdArgs.push_back("2");
// Lower: -x 6 0x100
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("6");
LowerCmdArgs.push_back("0x100");
// Lower: -x 42 0x400000
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("42");
LowerCmdArgs.push_back("0x400000");
// Lower: -y 129 4
LowerCmdArgs.push_back("-y");
LowerCmdArgs.push_back("129");
LowerCmdArgs.push_back("4");
// Lower: -x 129 0x400
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("129");
LowerCmdArgs.push_back("0x400");
// Lower: -y 216 1 (OPT_fno_fast_math)
LowerCmdArgs.push_back("-y");
LowerCmdArgs.push_back("216");
LowerCmdArgs.push_back("1");
// Lower: -ieee 1
LowerCmdArgs.push_back("-ieee");
LowerCmdArgs.push_back("1");
} else if (NeedRelaxedMath) {
// Lower: -x 15 0x400
LowerCmdArgs.push_back("-x");
LowerCmdArgs.push_back("15");
LowerCmdArgs.push_back("0x400");
// Lower: -y 216 1 (OPT_fno_fast_math)
LowerCmdArgs.push_back("-y");
LowerCmdArgs.push_back("216");
LowerCmdArgs.push_back("1");
// Lower: -ieee 0
LowerCmdArgs.push_back("-ieee");
LowerCmdArgs.push_back("0");
}

Expand Down Expand Up @@ -767,6 +781,7 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("70"); LowerCmdArgs.push_back("0x8000");
LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("122"); LowerCmdArgs.push_back("1");
LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("125"); LowerCmdArgs.push_back("0x20000");
LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("164"); LowerCmdArgs.push_back("0x800000");
LowerCmdArgs.push_back("-quad");
LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("59"); LowerCmdArgs.push_back("4");
LowerCmdArgs.push_back("-tp"); LowerCmdArgs.push_back("px");
Expand Down