Re: [PATCH] git-backport: support renamed .cc files in commit message.
On 1/18/22 20:10, Harald Anlauf via Fortran wrote:
Am 17.01.22 um 22:26 schrieb Martin Liška:
On 1/12/22 16:54, Martin Liška wrote:
There's a patch that enhances git-backport so that it updates commit
messages for files which name ends now with .cc and is still .c on a branch.
The patch has been installed as I've made the renaming now.
Cheers,
Martin
I just made a "git rebase" and had to manually fix the filenames
in the commit message. Otherwise gcc-verify would complain.
Sure and I'm adding a new script that basically follows all the 'did you mean'
in gcc-verify and fixes that:
ERR: unchanged file mentioned in a ChangeLog (did you mean
"contrib/gcc-git-customization.sh"?): "contrib/gcc2-git-customization.sh"
...
Would it make sense to have something that is clever enough for
rebase to do similar things as git-backport?
Yes, a new git alias 'gcc-fix-changelog' is going to be available with the
patch.
Martin
Thanks,
Harald
From 4f502745c8e2562ae192181bf2585bad42414d45 Mon Sep 17 00:00:00 2001
From: Martin Liska
Date: Wed, 19 Jan 2022 07:57:05 +0100
Subject: [PATCH] Come up with git-fix-changelog.py script.
contrib/ChangeLog:
* git-backport.py: Use it.
* git-fix-changelog.py: New file.
* gcc-git-customization.sh: Add new alias git gcc-fix-changelog.
---
contrib/gcc-git-customization.sh | 1 +
contrib/git-backport.py | 47 +---
contrib/git-fix-changelog.py | 92
3 files changed, 95 insertions(+), 45 deletions(-)
create mode 100755 contrib/git-fix-changelog.py
diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh
index aca61b781ff..2eec17937af 100755
--- a/contrib/gcc-git-customization.sh
+++ b/contrib/gcc-git-customization.sh
@@ -27,6 +27,7 @@ git config alias.gcc-undescr \!"f() { o=\$(git config --get gcc-config.upstream)
git config alias.gcc-verify '!f() { "`git rev-parse --show-toplevel`/contrib/gcc-changelog/git_check_commit.py" $@; } ; f'
git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/git-backport.py" $@; } ; f'
+git config alias.gcc-fix-changelog '!f() { "`git rev-parse --show-toplevel`/contrib/git-fix-changelog.py" $@; } ; f'
git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f'
git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" "$@"; }; f'
diff --git a/contrib/git-backport.py b/contrib/git-backport.py
index 83189a2b5c7..fc369d97754 100755
--- a/contrib/git-backport.py
+++ b/contrib/git-backport.py
@@ -22,29 +22,9 @@
import argparse
import os
import subprocess
-import tempfile
script_folder = os.path.dirname(os.path.abspath(__file__))
-verify_script = os.path.join(script_folder,
- 'gcc-changelog/git_check_commit.py')
-
-
-def replace_file_in_changelog(lines, filename):
-if not filename.endswith('.cc'):
-return
-
-# consider all componenets of a path: gcc/ipa-icf.cc
-while filename:
-for i, line in enumerate(lines):
-if filename in line:
-line = line.replace(filename, filename[:-1])
-lines[i] = line
-return
-parts = filename.split('/')
-if len(parts) == 1:
-return
-filename = '/'.join(parts[1:])
-
+fixup_script = os.path.join(script_folder, 'git-fix-changelog.py')
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Backport a git revision.')
@@ -52,27 +32,4 @@ if __name__ == '__main__':
args = parser.parse_args()
subprocess.run('git cherry-pick -x %s' % args.revision, shell=True)
-
-# Update commit message if change for a .cc file was taken
-r = subprocess.run(f'{verify_script} HEAD', shell=True, encoding='utf8',
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-if r.returncode != 0:
-lines = r.stdout.splitlines()
-cmd = 'git show -s --format=%B'
-commit_message = subprocess.check_output(cmd, shell=True,
- encoding='utf8').strip()
-commit_message = commit_message.splitlines()
-
-todo = [line for line in lines if 'unchanged file mentioned' in line]
-for item in todo:
-filename = item.split()[-1].strip('"')
-replace_file_in_changelog(commit_message, filename)
-
-with tempfile.NamedTemporaryFile('w', encoding='utf8',
- delete=False) as w:
-w.write('\n'.join(commit_message))
-w.close()
-subprocess.check_output(f'git commit --amend -F {w.name}',
-shell=True, encoding='utf8')
-os.unlink(w.name)
-print(f'Commit message updated: {len(todo)} .cc file(s) changed.')
+subprocess.run(fixup_script, shell=True)
diff --git a/contrib/git-fix-changelog.py b/contrib/git-fix-c
Re: How to generate a call inst. sequence?
Andras Tantos writes:
> All,
>
> I'm working on porting GCC to a processor architecture that doesn't have
> a (HW) stack nor a call instruction. This means that for calls, I need
> to generate the following instruction sequence:
>
> // move stack-pointer:
> $sp <- $sp-4
> // load return address:
> $r3 <- return_label
> // store return address on stack:
> mem[$sp] <- $r3
> // jump to callee:
> $pc <-
Even though this is internally a jump, it still needs to be represented
as a (call …) rtx in rtl, and emitted using emit_call_insn.
In other words, the "call" expander must always emit a call_insn
of some kind. (But it can emit other instructions too, such as the
ones you describe above.)
Richard
> return_label:
>
> Now, I can do all of that as a multi-instruction string sequence in my
> .md file (which is what I'm doing right now), but there are two problems
> with that approach. First, it hard-codes the temp register ($r3 above)
> and requires me to reserve it even though it could be used between calls
> by the register allocator. Second this approach (I think at least)
> prevents any passes from merging stack-frame preparation for the call
> arguments, such as eliminating the stack-pointer update above.
>
> I thought I could circumvent these problems by emitting a piece of RTL
> in the 'call' pattern:
>
> (define_expand "call"
> [(call
> (match_operand:QI 0 "memory_operand" "")
> (match_operand 1 "" "")
> )]
> ""
> {
> brew_expand_call(Pmode, operands);
> })
>
> where brew_expand_call is:
>
> void brew_expand_call(machine_mode mode, rtx *operands)
> {
> gcc_assert (MEM_P(operands[0]));
>
> rtx_code_label *label = gen_label_rtx();
> rtx label_ref = gen_rtx_LABEL_REF(SImode, label);
> rtx temp_reg = gen_reg_rtx(mode);
>
> // $sp <- $sp - 4
> emit_insn(gen_subsi3(
> stack_pointer_rtx,
> stack_pointer_rtx,
> GEN_INT(4)
> ));
> // $r3 <-
> emit_insn(gen_move_insn(
> temp_reg,
> label_ref
> ));
> // mem[$sp] <- $r3
> emit_insn(gen_move_insn(
> gen_rtx_MEM(Pmode, stack_pointer_rtx),
> temp_reg
> ));
> emit_jump_insn(gen_jump(operands[0]));
> emit_label(label);
> }
>
> If I try to compile the following test:
>
> void x(void)
> {
> }
>
> int main(void)
> {
> x();
> return 0;
> }
>
> I get an assert:
>
> during RTL pass: expand
> dump file: call.c.252r.expand
> call.c: In function ‘main’:
> call.c:9:1: internal compiler error: in as_a, at is-a.h:242
> 9 | }
> | ^
> 0x6999b7 rtx_insn* as_a(rtx_def*)
> ../../brew-gcc/gcc/is-a.h:242
> 0x6999b7 rtx_sequence::insn(int) const
> ../../brew-gcc/gcc/rtl.h:1439
> 0x6999b7 mark_jump_label_1
> ../../brew-gcc/gcc/jump.cc:1077
> 0xcfc31f mark_jump_label_1
> ../../brew-gcc/gcc/jump.cc:1171
> 0xcfc73d mark_all_labels
> ../../brew-gcc/gcc/jump.cc:332
> 0xcfc73d rebuild_jump_labels_1
> ../../brew-gcc/gcc/jump.cc:74
> 0x9e8e62 execute
> ../../brew-gcc/gcc/cfgexpand.cc:6845
>
> The reference dump file:
>
> ;; Function x (x, funcdef_no=0, decl_uid=1383, cgraph_uid=1,
> symbol_order=0)
>
>
> ;; Generating RTL for gimple basic block 2
>
>
> try_optimize_cfg iteration 1
>
> Merging block 3 into block 2...
> Merged blocks 2 and 3.
> Merged 2 and 3 without moving.
> Merging block 4 into block 2...
> Merged blocks 2 and 4.
> Merged 2 and 4 without moving.
>
>
> try_optimize_cfg iteration 2
>
>
>
> ;;
> ;; Full RTL generated for this function:
> ;;
> (note 1 0 3 NOTE_INSN_DELETED)
> (note 3 1 2 2 [bb 2] NOTE_INSN_BASIC_BLOCK)
> (note 2 3 0 2 NOTE_INSN_FUNCTION_BEG)
>
> ;; Function main (main, funcdef_no=1, decl_uid=1386, cgraph_uid=2,
> symbol_order=1)
>
>
> ;; Generating RTL for gimple basic block 2
>
> ;; Generating RTL for gimple basic block 3
>
>
>
> EMERGENCY DUMP:
>
> int main ()
> {
> (note 3 1 2 4 [bb 4] NOTE_INSN_BASIC_BLOCK)
> (note 2 3 4 4 NOTE_INSN_FUNCTION_BEG)
>
> (note 4 2 5 2 [bb 2] NOTE_INSN_BASIC_BLOCK)
> (insn 5 4 6 2 (set (reg/f:SI 1 $sp)
> (minus:SI (reg/f:SI 1 $sp)
> (const_int 4 [0x4]))) "call.c":7:5 -1
> (nil))
> (insn 6 5 7 2 (set (reg:SI 25)
> (label_ref:SI 9)) "call.c":7:5 -1
> (insn_list:REG_LABEL_OPERAND 9 (nil)))
> (insn 7 6 8 2 (set (mem:SI (reg/f:SI 1 $sp) [0 S4 A32])
> (reg:SI 25)) "call.c":7:5 -1
> (nil))
> (jump_insn 8 7 9 2 (set (pc)
> (label_ref (mem:QI (symbol_ref:SI ("x") [flags 0x3]
> ) [0 x S1 A8]))) "call.c":7:5 -1
> (nil))
> (code_label 9 8 10 2 3 (nil) [1 uses])
> (call_insn 10 9 11 2 (call (mem:QI (symbol_ref:SI ("x") [flags 0x3]
> ) [0 x S1 A8])
> (const_int 16 [0x10])) "call.c":7:5 -1
> (nil)
>
