From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 67A89394505B for ; Mon, 6 Apr 2020 15:12:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 67A89394505B Received: by mail-ot1-x329.google.com with SMTP id z5so15638999oth.9 for ; Mon, 06 Apr 2020 08:12:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=BKh/WX7/G0aLANaS1dxZUB9iSuSvBNPjSw/mIsEBtoM=; b=XB/gXqD60Sr0HlKneW8STfyJ1Jio/bT40ytYhL+JmiTgr5g9sBpXxrgb4iuV0tX/Qq xdLIUPGFi3qDjjAdQfkJj3ykb7nzPIuPtfORnCN3wIjkUKdMZTpeMrhZqhdREDDkguML hbjqUdpPNA2gHWWrkz/lG2LU9xTOjbS/n3GUgfH6ytwg1/a0gFS0XpvZQ0PESO5pSIUe 81wnvkj6hK1XZq9rHE8psecYFX6M2PqD04N+/v3U4kq8V2cfIBGGRQTuGgMQSpZ5Vs2p N13+jpfFbYOyEblo39WTTNwTj0eLnxn4XJXHRbsyRRDLRhS6d1KtmLcHA1+FNxZc0TDg qOAQ== X-Gm-Message-State: AGi0PuYfJ7rABLuZ2m+wSAIBDxN3kZvpDzsn7E6iMc5NZbga9ON4+Nfc ULF2GvY+cVZFmvEbc3vvNhizanom0S1iYm3ntEGOqMz4kJo= X-Google-Smtp-Source: APiQypKY6OzRIMxYuldCEsfAe6mtRv1OdKwAnAqmUFMNiwCPFrA8NOZQDk/7LJokTQlKZ03EqX0jLLYiOC7GrvbqIhE= X-Received: by 2002:a9d:5f7:: with SMTP id 110mr16008290otd.73.1586185953916; Mon, 06 Apr 2020 08:12:33 -0700 (PDT) MIME-Version: 1.0 From: Christophe Lyon Date: Mon, 6 Apr 2020 17:12:22 +0200 Message-ID: Subject: [testsuite][arm] Fix cmse-15.c expected output To: gcc Patches Content-Type: multipart/mixed; boundary="0000000000005508ab05a2a0b261" X-Spam-Status: No, score=-21.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2020 15:12:37 -0000 --0000000000005508ab05a2a0b261 Content-Type: text/plain; charset="UTF-8" Hi, While checking Martin's fix for PR ipa/94445, he made me realize that the cmse-15.c testcase still fails at -Os because ICF means that we generate nonsecure2: b nonsecure0 which is OK, but does not match the currently expected nonsecure2: ... bl __gnu_cmse_nonsecure_call (see https://gcc.gnu.org/pipermail/gcc-patches/2020-April/543190.html) The test has already different expectations for v8-M and v8.1-M. I've decided to try to use check-function-bodies to account for the different possibilities: - v8-M vs v8.1-M via two different prefixes - code generation variants (-0?) via multiple regexps I've tested that the test now passes with --target-board=-march=armv8-m.main and --target-board=-march=armv8.1-m.main. I feel this a bit too much of a burden for the purpose, maybe there's a better way of handling all these alternatives (in particular, there's a lot of duplication since the expected code for the secure* functions is the same for v8-M and v8.1-M). OK? Thanks, Christophe --0000000000005508ab05a2a0b261 Content-Type: text/plain; charset="US-ASCII"; name="cmse-15-function-bodies.patch.txt" Content-Disposition: attachment; filename="cmse-15-function-bodies.patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k8om5fev1 ZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2NjLnRhcmdldC9hcm0vY21zZS9jbXNlLTE1LmMg Yi9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYXJtL2Ntc2UvY21zZS0xNS5jCmluZGV4IDBlMzdi NTAuLjYwM2M0NTYgMTAwNjQ0Ci0tLSBhL2djYy90ZXN0c3VpdGUvZ2NjLnRhcmdldC9hcm0vY21z ZS9jbXNlLTE1LmMKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FybS9jbXNlL2Ntc2Ut MTUuYwpAQCAtMSw1ICsxLDkgQEAKIC8qIHsgZGctZG8gY29tcGlsZSB9ICovCiAvKiB7IGRnLW9w dGlvbnMgIi1tY21zZSIgfSAqLworLyogQVJNdjgtTSBleHBlY3RhdGlvbi4gICovCisvKiB7IGRn LWZpbmFsIHsgY2hlY2stZnVuY3Rpb24tYm9kaWVzICIqTm9jbGVhciIgIiIgIiIgeyB0YXJnZXQg eyAhIGFybV9jbXNlX2NsZWFyX29rIH0gfSB9IH0gKi8KKy8qIEFSTXY4LjEtTSBleHBlY3RhdGlv bi4gICovCisvKiB7IGRnLWZpbmFsIHsgY2hlY2stZnVuY3Rpb24tYm9kaWVzICIqQ2xlYXIiICIi ICIiIHsgdGFyZ2V0IGFybV9jbXNlX2NsZWFyX29rIH0gfSB9ICovCiAKIGludCBfX2F0dHJpYnV0 ZV9fICgoY21zZV9ub25zZWN1cmVfY2FsbCkpICgqbnNfZm9vKSAodm9pZCk7CiBpbnQgKCpzX2Jh cikgKHZvaWQpOwpAQCAtMTEsNjcgKzE1LDI0MiBAQCB0eXBlZGVmIGludCBzX2Jhcl90ICh2b2lk KTsKIHR5cGVkZWYgaW50IF9fYXR0cmlidXRlX18gKChjbXNlX25vbnNlY3VyZV9jYWxsKSkgKCog bnNfZm9vX3B0cikgKHZvaWQpOwogdHlwZWRlZiBpbnQgKCpzX2Jhcl9wdHIpICh2b2lkKTsKIAor LyoKKypDbGVhciBub25zZWN1cmUwOgorKkNsZWFyCS4uLgorKkNsZWFyCQlibHhucwlyWzAtM10K KypDbGVhcgkuLi4KKypOb2NsZWFyIG5vbnNlY3VyZTA6CisqTm9jbGVhcgkuLi4KKypOb2NsZWFy CWJsCV9fZ251X2Ntc2Vfbm9uc2VjdXJlX2NhbGwKKypOb2NsZWFyCS4uLgorKi8KIGludCBub25z ZWN1cmUwIChuc19mb29fdCAqIG5zX2Zvb19wKQogewogICByZXR1cm4gbnNfZm9vX3AgKCk7CiB9 CiAKKy8qCisqQ2xlYXIgbm9uc2VjdXJlMToKKypDbGVhcgkuLi4KKypDbGVhcgkJYmx4bnMJclsw LTNdCisqQ2xlYXIJLi4uCisqTm9jbGVhciBub25zZWN1cmUxOgorKk5vY2xlYXIJLi4uCisqTm9j bGVhcglibAlfX2dudV9jbXNlX25vbnNlY3VyZV9jYWxsCisqTm9jbGVhcgkuLi4KKyovCiBpbnQg bm9uc2VjdXJlMSAobnNfZm9vX3QgKiogbnNfZm9vX3ApCiB7CiAgIHJldHVybiAoKm5zX2Zvb19w KSAoKTsKIH0KIAorLyoKKypDbGVhciBub25zZWN1cmUyOgorKkNsZWFyCS4uLgorKkNsZWFyICgK KypDbGVhcgkJYmx4bnMJclswLTNdCisqQ2xlYXIgfAorKkNsZWFyCWIJbm9uc2VjdXJlMAorKkNs ZWFyICkKKypDbGVhcgkuLi4KKypOb2NsZWFyIG5vbnNlY3VyZTI6CisqTm9jbGVhcgkuLi4KKypO b2NsZWFyICgKKypOb2NsZWFyCWJsCV9fZ251X2Ntc2Vfbm9uc2VjdXJlX2NhbGwKKypOb2NsZWFy IHwKKypOb2NsZWFyCWIJbm9uc2VjdXJlMAorKk5vY2xlYXIgKQorKk5vY2xlYXIJLi4uCisqLwog aW50IG5vbnNlY3VyZTIgKG5zX2Zvb19wdHIgbnNfZm9vX3ApCiB7CiAgIHJldHVybiBuc19mb29f cCAoKTsKIH0KKworLyoKKypDbGVhciBub25zZWN1cmUzOgorKkNsZWFyCS4uLgorKkNsZWFyCQli bHhucwlyWzAtM10KKypDbGVhcgkuLi4KKypOb2NsZWFyIG5vbnNlY3VyZTM6CisqTm9jbGVhcgku Li4KKypOb2NsZWFyCWJsCV9fZ251X2Ntc2Vfbm9uc2VjdXJlX2NhbGwKKypOb2NsZWFyCS4uLgor Ki8KIGludCBub25zZWN1cmUzIChuc19mb29fcHRyICogbnNfZm9vX3ApCiB7CiAgIHJldHVybiAo Km5zX2Zvb19wKSAoKTsKIH0KIAorLyoKKypDbGVhciBzZWN1cmUwOgorKkNsZWFyCS4uLgorKkNs ZWFyICgKKypDbGVhcglieAlyWzAtM10KKypDbGVhciB8CisqQ2xlYXIJYmx4CXJbMC0zXQorKkNs ZWFyICkKKypDbGVhcgkuLi4KKypOb2NsZWFyIHNlY3VyZTA6CisqTm9jbGVhcgkuLi4KKypOb2Ns ZWFyICgKKypOb2NsZWFyCWJ4CXJbMC0zXQorKk5vY2xlYXIgfAorKk5vY2xlYXIJYmx4CXJbMC0z XQorKk5vY2xlYXIgKQorKk5vY2xlYXIJLi4uCisqLwogaW50IHNlY3VyZTAgKHNfYmFyX3QgKiBz X2Jhcl9wKQogewogICByZXR1cm4gc19iYXJfcCAoKTsKIH0KIAorLyoKKypDbGVhciBzZWN1cmUx OgorKkNsZWFyCS4uLgorKkNsZWFyICgKKypDbGVhcglieAlyWzAtM10KKypDbGVhciB8CisqQ2xl YXIJYmx4CXJbMC0zXQorKkNsZWFyICkKKypDbGVhcgkuLi4KKypOb2NsZWFyIHNlY3VyZTE6Cisq Tm9jbGVhcgkuLi4KKypOb2NsZWFyICgKKypOb2NsZWFyCWJ4CXJbMC0zXQorKk5vY2xlYXIgfAor Kk5vY2xlYXIJYmx4CXJbMC0zXQorKk5vY2xlYXIgKQorKk5vY2xlYXIJLi4uCisqLwogaW50IHNl Y3VyZTEgKHNfYmFyX3QgKiogc19iYXJfcCkKIHsKICAgcmV0dXJuICgqc19iYXJfcCkgKCk7CiB9 CiAKKy8qCisqQ2xlYXIgc2VjdXJlMjoKKypDbGVhcgkuLi4KKypDbGVhciAoCisqQ2xlYXIJYngJ clswLTNdCisqQ2xlYXIgfAorKkNsZWFyCWJseAlyWzAtM10KKypDbGVhciB8CisqQ2xlYXIJYglz ZWN1cmUwCisqQ2xlYXIgKQorKkNsZWFyCS4uLgorKk5vY2xlYXIgc2VjdXJlMjoKKypOb2NsZWFy CS4uLgorKk5vY2xlYXIgKAorKk5vY2xlYXIJYngJclswLTNdCisqTm9jbGVhciB8CisqTm9jbGVh cglibHgJclswLTNdCisqTm9jbGVhciB8CisqTm9jbGVhcgliCXNlY3VyZTAKKypOb2NsZWFyICkK KypOb2NsZWFyCS4uLgorKi8KIGludCBzZWN1cmUyIChzX2Jhcl9wdHIgc19iYXJfcCkKIHsKICAg cmV0dXJuIHNfYmFyX3AgKCk7CiB9CiAKKy8qCisqQ2xlYXIgc2VjdXJlMzoKKypDbGVhcgkuLi4K KypDbGVhciAoCisqQ2xlYXIJYngJclswLTNdCisqQ2xlYXIgfAorKkNsZWFyCWJseAlyWzAtM10K KypDbGVhciApCisqQ2xlYXIJLi4uCisqTm9jbGVhciBzZWN1cmUzOgorKk5vY2xlYXIJLi4uCisq Tm9jbGVhciAoCisqTm9jbGVhcglieAlyWzAtM10KKypOb2NsZWFyIHwKKypOb2NsZWFyCWJseAly WzAtM10KKypOb2NsZWFyICkKKypOb2NsZWFyCS4uLgorKi8KIGludCBzZWN1cmUzIChzX2Jhcl9w dHIgKiBzX2Jhcl9wKQogewogICByZXR1cm4gKCpzX2Jhcl9wKSAoKTsKIH0KIAorLyoKKypDbGVh ciBub25zZWN1cmU0OgorKkNsZWFyCS4uLgorKkNsZWFyCQlibHhucwlyWzAtM10KKypDbGVhcgku Li4KKypOb2NsZWFyIG5vbnNlY3VyZTQ6CisqTm9jbGVhcgkuLi4KKypOb2NsZWFyCWJsCV9fZ251 X2Ntc2Vfbm9uc2VjdXJlX2NhbGwKKypOb2NsZWFyCS4uLgorKi8KIGludCBub25zZWN1cmU0ICh2 b2lkKQogewogICByZXR1cm4gbnNfZm9vICgpOwogfQogCisvKgorKkNsZWFyIG5vbnNlY3VyZTU6 CisqQ2xlYXIJLi4uCisqQ2xlYXIJCWJseG5zCXJbMC0zXQorKkNsZWFyCS4uLgorKk5vY2xlYXIg bm9uc2VjdXJlNToKKypOb2NsZWFyCS4uLgorKk5vY2xlYXIJYmwJX19nbnVfY21zZV9ub25zZWN1 cmVfY2FsbAorKk5vY2xlYXIJLi4uCisqLwogaW50IG5vbnNlY3VyZTUgKHZvaWQpCiB7CiAgIHJl dHVybiAoKm5zX2ZvbzIpICgpOwogfQogCisvKgorKkNsZWFyIHNlY3VyZTQ6CisqQ2xlYXIJLi4u CisqQ2xlYXIgKAorKkNsZWFyCWJ4CXJbMC0zXQorKkNsZWFyIHwKKypDbGVhcglibHgJclswLTNd CisqQ2xlYXIgKQorKkNsZWFyCS4uLgorKk5vY2xlYXIgc2VjdXJlNDoKKypOb2NsZWFyCS4uLgor Kk5vY2xlYXIgKAorKk5vY2xlYXIJYngJclswLTNdCisqTm9jbGVhciB8CisqTm9jbGVhcglibHgJ clswLTNdCisqTm9jbGVhciApCisqTm9jbGVhcgkuLi4KKyovCiBpbnQgc2VjdXJlNCAodm9pZCkK IHsKICAgcmV0dXJuIHNfYmFyICgpOwogfQogCisvKgorKkNsZWFyIHNlY3VyZTU6CisqQ2xlYXIJ Li4uCisqQ2xlYXIgKAorKkNsZWFyCWJ4CXJbMC0zXQorKkNsZWFyIHwKKypDbGVhcglibHgJclsw LTNdCisqQ2xlYXIgKQorKkNsZWFyCS4uLgorKk5vY2xlYXIgc2VjdXJlNToKKypOb2NsZWFyCS4u LgorKk5vY2xlYXIgKAorKk5vY2xlYXIJYngJclswLTNdCisqTm9jbGVhciB8CisqTm9jbGVhcgli bHgJclswLTNdCisqTm9jbGVhciApCisqTm9jbGVhcgkuLi4KKyovCiBpbnQgc2VjdXJlNSAodm9p ZCkKIHsKICAgcmV0dXJuICgqc19iYXIyKSAoKTsKIH0KLQotLyogQVJNdjgtTSBleHBlY3RhdGlv bi4gICovCi0vKiB7IGRnLWZpbmFsIHsgc2Nhbi1hc3NlbWJsZXItdGltZXMgImJsXFxzK19fZ251 X2Ntc2Vfbm9uc2VjdXJlX2NhbGwiIDYgeyB0YXJnZXQgeyAhIGFybV9jbXNlX2NsZWFyX29rIH0g fSB9IH0gKi8KLQotLyogQVJNdjguMS1NIGV4cGVjdGF0aW9uLiAgKi8KLS8qIHsgZGctZmluYWwg eyBzY2FuLWFzc2VtYmxlci10aW1lcyAiYmx4bnMiIDYgeyB0YXJnZXQgYXJtX2Ntc2VfY2xlYXJf b2sgfSB9IH0gKi8K --0000000000005508ab05a2a0b261 Content-Type: text/plain; charset="US-ASCII"; name="cmse-15-function-bodies.chlog.txt" Content-Disposition: attachment; filename="cmse-15-function-bodies.chlog.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k8om5fe10 MjAyMC0wNC0wNiAgQ2hyaXN0b3BoZSBMeW9uICA8Y2hyaXN0b3BoZS5seW9uQGxpbmFyby5vcmc+ CgoJZ2NjL3Rlc3RzdWl0ZS8KCSogZ2NjLnRhcmdldC9hcm0vY21zZS9jbXNlLTE1LmM6IFVzZSBj aGVjay1mdW5jdGlvbi1ib2RpZXMuCgo= --0000000000005508ab05a2a0b261--