From: "Martin Liška" <mliska@suse.cz>
To: "gcc-patch >> GCC Patches" <gcc-patches@gcc.gnu.org>
Cc: "hubi >> Jan Hubicka" <hubicka@ucw.cz>
Subject: [PATCH] Fix for PR63595
Date: Fri, 24 Oct 2014 09:44:00 -0000 [thread overview]
Message-ID: <544A1D50.5080200@suse.cz> (raw)
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
Hello.
Following patch contains addition of PHI result comparison in IPA ICF.
Boostrap works on x86_64-linux-pc, no regression observed.
Ready for trunk?
Thanks,
Martin
[-- Attachment #2: PR63595.changelog --]
[-- Type: text/plain, Size: 244 bytes --]
gcc/testsuite/ChangeLog:
2014-10-24 Martin Liska <mliska@suse.cz>
* gcc.dg/ipa/pr63595.c: New test.
gcc/ChangeLog:
2014-10-24 Martin Liska <mliska@suse.cz>
* ipa-icf.c (sem_function::compare_phi_node): PHI result comparison
added.
[-- Attachment #3: PR63595.patch --]
[-- Type: text/x-patch, Size: 3260 bytes --]
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index d1238a4..7456fec 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -869,6 +869,12 @@ sem_function::compare_phi_node (basic_block bb1, basic_block bb2)
phi1 = gsi_stmt (si1);
phi2 = gsi_stmt (si2);
+ tree phi_result1 = gimple_phi_result (phi1);
+ tree phi_result2 = gimple_phi_result (phi2);
+
+ if (!m_checker->compare_operand (phi_result1, phi_result2))
+ return return_false_with_msg ("PHI results are different");
+
size1 = gimple_phi_num_args (phi1);
size2 = gimple_phi_num_args (phi2);
diff --git a/gcc/testsuite/gcc.dg/ipa/pr63595.c b/gcc/testsuite/gcc.dg/ipa/pr63595.c
new file mode 100644
index 0000000..52851fb
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr63595.c
@@ -0,0 +1,65 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-ipa-icf-details" } */
+
+typedef int size_t;
+
+typedef struct TypHeader {
+ unsigned long size;
+ struct TypHeader * * ptr;
+ char name[3];
+ unsigned char type;
+} * TypHandle;
+
+__attribute__((noinline))
+static TypHandle Error(const char *str, unsigned long l1, unsigned long l2)
+{
+ return 0;
+}
+
+extern TypHandle (* EvTab[81]) ( TypHandle hd );
+extern TypHandle (*TabProd[28][28]) ( TypHandle, TypHandle );
+
+__attribute__((noinline))
+TypHandle FunOnRight (TypHandle hdCall)
+{
+ TypHandle hdRes;
+ TypHandle hdPnt;
+ TypHandle hdElm;
+
+
+ if ( ((hdCall)->size) != 3*((size_t)sizeof(TypHandle)) )
+ return Error("",0L,0L);
+ hdPnt = ((long)(((TypHandle*)((hdCall)->ptr))[1])&1 ? (((TypHandle*)((hdCall)->ptr))[1]) : (* EvTab[(((long)(((TypHandle*)((hdCall)->ptr))[1]) & 1) ? 1 : ((((TypHandle*)((hdCall)->ptr))[1])->type))])((((TypHandle*)((hdCall)->ptr))[1])));
+ hdElm = ((long)(((TypHandle*)((hdCall)->ptr))[2])&1 ? (((TypHandle*)((hdCall)->ptr))[2]) : (* EvTab[(((long)(((TypHandle*)((hdCall)->ptr))[2]) & 1) ? 1 : ((((TypHandle*)((hdCall)->ptr))[2])->type))])((((TypHandle*)((hdCall)->ptr))[2])));
+
+
+ hdRes = ((*TabProd[(((long)(hdPnt) & 1) ? 1 : ((hdPnt)->type))][(((long)(hdElm) & 1) ? 1 : ((hdElm)->type))])((hdPnt),(hdElm)));
+ return hdRes;
+}
+
+__attribute__((noinline))
+TypHandle FunOnLeft (TypHandle hdCall)
+{
+ TypHandle hdRes;
+ TypHandle hdPnt;
+ TypHandle hdElm;
+
+
+ if ( ((hdCall)->size) != 3*((size_t)sizeof(TypHandle)) )
+ return Error("",0L,0L);
+ hdPnt = ((long)(((TypHandle*)((hdCall)->ptr))[1])&1 ? (((TypHandle*)((hdCall)->ptr))[1]) : (* EvTab[(((long)(((TypHandle*)((hdCall)->ptr))[1]) & 1) ? 1 : ((((TypHandle*)((hdCall)->ptr))[1])->type))])((((TypHandle*)((hdCall)->ptr))[1])));
+ hdElm = ((long)(((TypHandle*)((hdCall)->ptr))[2])&1 ? (((TypHandle*)((hdCall)->ptr))[2]) : (* EvTab[(((long)(((TypHandle*)((hdCall)->ptr))[2]) & 1) ? 1 : ((((TypHandle*)((hdCall)->ptr))[2])->type))])((((TypHandle*)((hdCall)->ptr))[2])));
+
+
+ hdRes = ((*TabProd[(((long)(hdElm) & 1) ? 1 : ((hdElm)->type))][(((long)(hdPnt) & 1) ? 1 : ((hdPnt)->type))])((hdElm),(hdPnt)));
+ return hdRes;
+}
+
+int main()
+{
+ return 0;
+}
+
+/* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf" } } */
+/* { dg-final { scan-ipa-dump "PHI results are different" "icf" } } */
+/* { dg-final { cleanup-ipa-dump "icf" } } */
next reply other threads:[~2014-10-24 9:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-24 9:44 Martin Liška [this message]
2014-10-24 10:12 ` Richard Biener
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=544A1D50.5080200@suse.cz \
--to=mliska@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
--cc=hubicka@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).