diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-06-28 12:10:12 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-09-05 07:17:15 +0200 |
| commit | 22af50a48d2b4371ee6d805d95f56212fbe611b1 (patch) | |
| tree | 3a8cb01dc93df5de0b6c21ee0423df51da76c917 /gcc | |
| parent | de3ca363811a3974e4398ecdb1db2274efd61a1c (diff) | |
| download | gcc-22af50a48d2b4371ee6d805d95f56212fbe611b1.zip gcc-22af50a48d2b4371ee6d805d95f56212fbe611b1.tar.gz gcc-22af50a48d2b4371ee6d805d95f56212fbe611b1.tar.bz2 | |
Handle 'NUM' in 'PUSH_INSERT_PASSES_WITHIN'
..., such that also for repeated 'NEXT_PASS', 'PUSH_INSERT_PASSES_WITHIN' for a
given 'PASS', the 'PUSH_INSERT_PASSES_WITHIN' applies to the preceeding
'NEXT_PASS', and not unconditionally applies to the first 'NEXT_PASS'.
gcc/
* gen-pass-instances.awk: Handle 'PUSH_INSERT_PASSES_WITHIN'.
* pass_manager.h (PUSH_INSERT_PASSES_WITHIN): Adjust.
* passes.cc (PUSH_INSERT_PASSES_WITHIN): Likewise.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/gen-pass-instances.awk | 28 | ||||
| -rw-r--r-- | gcc/pass_manager.h | 2 | ||||
| -rw-r--r-- | gcc/passes.cc | 6 |
3 files changed, 29 insertions, 7 deletions
diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk index 4498896..871ac0c 100644 --- a/gcc/gen-pass-instances.awk +++ b/gcc/gen-pass-instances.awk @@ -16,7 +16,7 @@ # This Awk script takes passes.def and writes pass-instances.def, # counting the instances of each kind of pass, adding an instance number -# to everywhere that NEXT_PASS is used. +# to everywhere that NEXT_PASS or PUSH_INSERT_PASSES_WITHIN are used. # Also handle INSERT_PASS_AFTER, INSERT_PASS_BEFORE and REPLACE_PASS # directives. # @@ -222,9 +222,31 @@ END { if (with_arg) printf ",%s", with_arg; printf ")%s\n", postfix; + + continue; } - else - print lines[i]; + + ret = parse_line(lines[i], "PUSH_INSERT_PASSES_WITHIN"); + if (ret) + { + pass_name = args[1]; + + pass_num = pass_final_counts[pass_name]; + if (!pass_num) + { + print "ERROR: Can't locate instance of the pass mentioned in " pass_name; + exit 1; + } + + printf "%s", prefix; + printf "PUSH_INSERT_PASSES_WITHIN"; + printf " (%s, %s", pass_name, pass_num; + printf ")%s\n", postfix; + + continue; + } + + print lines[i]; } } diff --git a/gcc/pass_manager.h b/gcc/pass_manager.h index be324d5..edd775e 100644 --- a/gcc/pass_manager.h +++ b/gcc/pass_manager.h @@ -126,7 +126,7 @@ private: opt_pass *pass_copy_prop_8; */ #define INSERT_PASSES_AFTER(PASS) -#define PUSH_INSERT_PASSES_WITHIN(PASS) +#define PUSH_INSERT_PASSES_WITHIN(PASS, NUM) #define POP_INSERT_PASSES() #define NEXT_PASS(PASS, NUM) opt_pass *PASS ## _ ## NUM #define NEXT_PASS_WITH_ARG(PASS, NUM, ARG) NEXT_PASS (PASS, NUM) diff --git a/gcc/passes.cc b/gcc/passes.cc index e2a07eb..775c3e4 100644 --- a/gcc/passes.cc +++ b/gcc/passes.cc @@ -1585,7 +1585,7 @@ pass_manager::pass_manager (context *ctxt) /* Zero-initialize pass members. */ #define INSERT_PASSES_AFTER(PASS) -#define PUSH_INSERT_PASSES_WITHIN(PASS) +#define PUSH_INSERT_PASSES_WITHIN(PASS, NUM) #define POP_INSERT_PASSES() #define NEXT_PASS(PASS, NUM) PASS ## _ ## NUM = NULL #define NEXT_PASS_WITH_ARG(PASS, NUM, ARG) NEXT_PASS (PASS, NUM) @@ -1615,9 +1615,9 @@ pass_manager::pass_manager (context *ctxt) *p = NULL; \ } -#define PUSH_INSERT_PASSES_WITHIN(PASS) \ +#define PUSH_INSERT_PASSES_WITHIN(PASS, NUM) \ { \ - opt_pass **p = &(PASS ## _1)->sub; + opt_pass **p = &(PASS ## _ ## NUM)->sub; #define POP_INSERT_PASSES() \ } |