Commit 3443e9b6 authored by John van Groningen's avatar John van Groningen
Browse files

Merge branch 'genFusionFlag' into 'master'

Add flag for turning generic fusion on/off

See merge request !17
parents 49d04cfb 24307323
Pipeline #49179 passed with stage
in 9 seconds
......@@ -1270,7 +1270,7 @@ static int project_node_is_abc_up_to_date (P_NODE project_node)
}
if (project_node==main_project_node &&
((DEBUG_MASK | STRICTNESS_ANALYSIS_MASK | FUSION_MASK | NO_REUSE_UNIQUE_NODES_MASK) & clean_options_mask & (clean_options ^ abc_options))!=0)
((DEBUG_MASK | STRICTNESS_ANALYSIS_MASK | FUSION_MASK | GENERIC_FUSION_MASK | NO_REUSE_UNIQUE_NODES_MASK) & clean_options_mask & (clean_options ^ abc_options))!=0)
{
if (verbose)
warning_s ("(%s.icl is compiled with different options)", project_node->pro_fname);
......@@ -2041,16 +2041,12 @@ static int compile_project_node (P_NODE project_node)
if (((clean_options & LIST_ALL_TYPES_MASK)!=0)!=DEFAULT_LIST_ALL_TYPES)
*arg++="-lat";
if ((clean_options & NO_REUSE_UNIQUE_NODES_MASK)==0)
*arg++="-ou";
if ((clean_options & MEMORY_PROFILE)!=0)
*arg++="-pm";
if ((clean_options & NO_TIME_PROFILE_MASK)==0)
*arg++="-pt";
if ((clean_options & CALLGRAPH_PROFILE_MASK)!=0)
*arg++="-pg";
if ((clean_options & FUSION_MASK)!=0)
*arg++="-fusion";
if (dynamics)
*arg++="-dynamics";
......@@ -2071,6 +2067,12 @@ static int compile_project_node (P_NODE project_node)
*arg++="-d";
if (((options & STRICTNESS_ANALYSIS_MASK)!=0)!=DEFAULT_STRICTNESS_ANALYSIS)
*arg++="-sa";
if ((options & NO_REUSE_UNIQUE_NODES_MASK)==0)
*arg++="-ou";
if ((options & FUSION_MASK)!=0)
*arg++="-fusion";
if ((options & GENERIC_FUSION_MASK)!=0)
*arg++="-generic_fusion";
if (list_strict_export_types)
*arg++="-lset";
......@@ -4064,6 +4066,9 @@ static void argument_error (void)
printf (" -fusion -nfusion\n");
printf (" Enable/disable optimizing by fusion transformation\n");
printf (" (default: -nfusion)\n");
printf (" -generic_fusion -ngeneric_fusion\n");
printf (" Enable/disable optimizing by generic fusion transformation\n");
printf (" (default: -ngeneric_fusion)\n");
printf (" -pt -npt Enable/disable the generation of code for time profiling\n");
printf (" (default: -npt)\n");
printf (" -pg -npg Enable/disable the generation of code for callgraph profiling\n");
......@@ -4596,6 +4601,10 @@ int main (int argc,char **argv)
option_on (FUSION_MASK);
} else if (!strcmp (s,"nfusion")){
option_off (FUSION_MASK);
} else if (!strcmp (s,"generic_fusion")){
option_on (GENERIC_FUSION_MASK);
} else if (!strcmp (s,"ngeneric_fusion")){
option_off (GENERIC_FUSION_MASK);
} else if (!strcmp (s,"dynamics")){
dynamics=1;
} else if (!strcmp (s,"clc")){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment