On Fri, May 22, 2020 at 4:22 AM H.J. Lu <hjl.to...@gmail.com> wrote: > > On Sat, May 2, 2020 at 4:55 AM H.J. Lu <hjl.to...@gmail.com> wrote: > > > > Currently patchable area is at the wrong place. It is placed immediately > > after function label, before both .cfi_startproc and ENDBR. This patch > > adds UNSPECV_PATCHABLE_AREA for pseudo patchable area instruction and > > changes ENDBR insertion pass to also insert patchable area instruction. > > TARGET_ASM_PRINT_PATCHABLE_FUNCTION_ENTRY is defined to avoid placing > > patchable area before .cfi_startproc and ENDBR. > > > > OK for master? > > > > Thanks. > > > > H.J. > > --- > > gcc/ > > > > PR target/93492 > > * config/i386/i386-features.c (rest_of_insert_endbranch): > > Renamed to ... > > (rest_of_insert_endbr_and_patchable_area): Change return type > > to void. Add need_endbr and patchable_area_size arguments. > > Don't call timevar_push nor timevar_pop. Replace > > endbr_queued_at_entrance with insn_queued_at_entrance. Insert > > UNSPECV_PATCHABLE_AREA for patchable area. > > (pass_data_insert_endbranch): Renamed to ... > > (pass_data_insert_endbr_and_patchable_area): This. Change > > pass name to endbr_and_patchable_area. > > (pass_insert_endbranch): Renamed to ... > > (pass_insert_endbr_and_patchable_area): This. Add need_endbr > > and patchable_area_size;. > > (pass_insert_endbr_and_patchable_area::gate): Set and check > > need_endbr and patchable_area_size. > > (pass_insert_endbr_and_patchable_area::execute): Call > > timevar_push and timevar_pop. Pass need_endbr and > > patchable_area_size to rest_of_insert_endbr_and_patchable_area. > > (make_pass_insert_endbranch): Renamed to ... > > (make_pass_insert_endbr_and_patchable_area): This. > > * config/i386/i386-passes.def: Replace pass_insert_endbranch > > with pass_insert_endbr_and_patchable_area. > > * config/i386/i386-protos.h (ix86_output_patchable_area): New. > > (make_pass_insert_endbranch): Renamed to ... > > (make_pass_insert_endbr_and_patchable_area): This. > > * config/i386/i386.c (ix86_asm_output_function_label): Set > > function_label_emitted to true. > > (ix86_print_patchable_function_entry): New function. > > (ix86_output_patchable_area): Likewise. > > (x86_function_profiler): Replace endbr_queued_at_entrance with > > insn_queued_at_entrance. Generate ENDBR only for TYPE_ENDBR. > > Call ix86_output_patchable_area to generate patchable area if > > needed. > > (TARGET_ASM_PRINT_PATCHABLE_FUNCTION_ENTRY): New. > > * i386.h (queued_insn_type): New. > > (machine_function): Add function_label_emitted. Replace > > endbr_queued_at_entrance with insn_queued_at_entrance. > > * config/i386/i386.md (UNSPECV_PATCHABLE_AREA): New. > > (patchable_area): New. > > > > gcc/testsuite/ > > > > PR target/93492 > > * gcc.target/i386/pr93492-1.c: New test. > > * gcc.target/i386/pr93492-2.c: Likewise. > > * gcc.target/i386/pr93492-3.c: Likewise. > > * gcc.target/i386/pr93492-4.c: Likewise. > > * gcc.target/i386/pr93492-5.c: Likewise. > > PING: > > https://gcc.gnu.org/pipermail/gcc-patches/2020-May/545021.html
PING. -- H.J.
