From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14924 invoked by alias); 6 Mar 2013 23:05:13 -0000 Received: (qmail 14813 invoked by uid 22791); 6 Mar 2013 23:05:10 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-vb0-f51.google.com (HELO mail-vb0-f51.google.com) (209.85.212.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Mar 2013 23:05:05 +0000 Received: by mail-vb0-f51.google.com with SMTP id fq11so1877023vbb.38 for ; Wed, 06 Mar 2013 15:05:04 -0800 (PST) X-Received: by 10.220.8.75 with SMTP id g11mr11914797vcg.60.1362611104463; Wed, 06 Mar 2013 15:05:04 -0800 (PST) MIME-Version: 1.0 Received: by 10.58.237.1 with HTTP; Wed, 6 Mar 2013 15:04:23 -0800 (PST) From: Steven Bosscher Date: Wed, 06 Mar 2013 23:05:00 -0000 Message-ID: Subject: [patch] minor bitmap.c GATHER_STATISTICS fix-ups To: GCC Patches Cc: Richard Biener Content-Type: multipart/mixed; boundary=bcaec54b4568d943ec04d7499e56 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-03/txt/msg00276.txt.bz2 --bcaec54b4568d943ec04d7499e56 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 727 Hello, This patch fixes a bunch of smaller issues with GATHER_STATISTICS for bitmaps: overflows in counters and ugly output format. Bootstrapped (with and without GATHER_STATISTICS) and regtested on powerpc64-unknown-linux-gnu and on x86_64-unknown-linux-gnu. OK for trunk? Ciao! Steven * bitmap.c (struct bitmap_descriptor_d): Use unsigned HOST_WIDEST_INT for all counters. (struct output_info): Likewise. (register_overhead): Remove bad gcc_assert. (bitmap_find_bit): If there is only a single bitmap element, do not count a miss as a search. (print_statistics): Update for counter type changes. (dump_bitmap_statistics): Likewise. Print headers such that they are properly lined up with the printed counters. --bcaec54b4568d943ec04d7499e56 Content-Type: text/plain; charset=US-ASCII; name="bitmap_stats_fixes.diff.txt" Content-Disposition: attachment; filename="bitmap_stats_fixes.diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hdz3fa3k0 Content-length: 5503 CSogYml0bWFwLmMgKHN0cnVjdCBiaXRtYXBfZGVzY3JpcHRvcl9kKTogVXNl IHVuc2lnbmVkIEhPU1RfV0lERVNUX0lOVAoJZm9yIGFsbCBjb3VudGVycy4K CShzdHJ1Y3Qgb3V0cHV0X2luZm8pOiBMaWtld2lzZS4KCShyZWdpc3Rlcl9v dmVyaGVhZCk6IFJlbW92ZSBiYWQgZ2NjX2Fzc2VydC4KCShiaXRtYXBfZmlu ZF9iaXQpOiBJZiB0aGVyZSBpcyBvbmx5IGEgc2luZ2xlIGJpdG1hcCBlbGVt ZW50LCBkbyBub3QKCWNvdW50IGEgbWlzcyBhcyBhIHNlYXJjaC4KCShwcmlu dF9zdGF0aXN0aWNzKTogVXBkYXRlIGZvciBjb3VudGVyIHR5cGUgY2hhbmdl cy4KCShkdW1wX2JpdG1hcF9zdGF0aXN0aWNzKTogTGlrZXdpc2UuICBQcmlu dCBoZWFkZXJzIHN1Y2ggdGhhdCB0aGV5CglhcmUgcHJvcGVybHkgbGluZWQg dXAgd2l0aCB0aGUgcHJpbnRlZCBjb3VudGVycy4KCkluZGV4OiBiaXRtYXAu Ywo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaXRtYXAuYwkocmV2aXNp b24gMTk2NTA4KQorKysgYml0bWFwLmMJKHdvcmtpbmcgY29weSkKQEAgLTM0 LDExICszNCwxMSBAQCBzdHJ1Y3QgYml0bWFwX2Rlc2NyaXB0b3JfZAogICBj b25zdCBjaGFyICpmaWxlOwogICBpbnQgbGluZTsKICAgaW50IGNyZWF0ZWQ7 Ci0gIEhPU1RfV0lERVNUX0lOVCBhbGxvY2F0ZWQ7Ci0gIEhPU1RfV0lERVNU X0lOVCBwZWFrOwotICBIT1NUX1dJREVTVF9JTlQgY3VycmVudDsKLSAgaW50 IG5zZWFyY2hlczsKLSAgaW50IHNlYXJjaF9pdGVyOworICB1bnNpZ25lZCBI T1NUX1dJREVTVF9JTlQgYWxsb2NhdGVkOworICB1bnNpZ25lZCBIT1NUX1dJ REVTVF9JTlQgcGVhazsKKyAgdW5zaWduZWQgSE9TVF9XSURFU1RfSU5UIGN1 cnJlbnQ7CisgIHVuc2lnbmVkIEhPU1RfV0lERVNUX0lOVCBuc2VhcmNoZXM7 CisgIHVuc2lnbmVkIEhPU1RfV0lERVNUX0lOVCBzZWFyY2hfaXRlcjsKIH07 CiAKIHR5cGVkZWYgc3RydWN0IGJpdG1hcF9kZXNjcmlwdG9yX2QgKmJpdG1h cF9kZXNjcmlwdG9yOwpAQCAtMTIxLDcgKzEyMSw2IEBAIHJlZ2lzdGVyX292 ZXJoZWFkIChiaXRtYXAgYiwgaW50IGFtb3VudCkKICAgZGVzYy0+Y3VycmVu dCArPSBhbW91bnQ7CiAgIGlmIChhbW91bnQgPiAwKQogICAgIGRlc2MtPmFs bG9jYXRlZCArPSBhbW91bnQ7Ci0gIGdjY19hc3NlcnQgKGRlc2MtPmN1cnJl bnQgPj0gMCk7CiAgIGlmIChkZXNjLT5wZWFrIDwgZGVzYy0+Y3VycmVudCkK ICAgICBkZXNjLT5wZWFrID0gZGVzYy0+Y3VycmVudDsKIH0KQEAgLTU2NSwx MCArNTY0LDE1IEBAIGJpdG1hcF9maW5kX2JpdCAoYml0bWFwIGhlYWQsIHVu c2lnbmVkIGludCBiaXQpCiAgIGJpdG1hcF9lbGVtZW50ICplbGVtZW50Owog ICB1bnNpZ25lZCBpbnQgaW5keCA9IGJpdCAvIEJJVE1BUF9FTEVNRU5UX0FM TF9CSVRTOwogCi0gIGlmIChoZWFkLT5jdXJyZW50ID09IDAKKyAgaWYgKGhl YWQtPmN1cnJlbnQgPT0gTlVMTAogICAgICAgfHwgaGVhZC0+aW5keCA9PSBp bmR4KQogICAgIHJldHVybiBoZWFkLT5jdXJyZW50OworICBpZiAoaGVhZC0+ Y3VycmVudCA9PSBoZWFkLT5maXJzdAorICAgICAgJiYgaGVhZC0+Zmlyc3Qt Pm5leHQgPT0gTlVMTCkKKyAgICByZXR1cm4gTlVMTDsKIAorICAvKiBUaGlz IGJpdG1hcCBoYXMgbW9yZSB0aGFuIG9uZSBlbGVtZW50LCBhbmQgd2UncmUg Z29pbmcgdG8gbG9vaworICAgICB0aHJvdWdoIHRoZSBlbGVtZW50cyBsaXN0 LiAgQ291bnQgdGhhdCBhcyBhIHNlYXJjaC4gICovCiAgIGlmIChHQVRIRVJf U1RBVElTVElDUykKICAgICBiaXRtYXBfZGVzY3JpcHRvcnNbaGVhZC0+ZGVz Y3JpcHRvcl9pZF0tPm5zZWFyY2hlcysrOwogCkBAIC0yMTMyLDggKzIxMzYs OCBAQCBiaXRtYXBfcHJpbnQgKEZJTEUgKmZpbGUsIGNvbnN0X2JpdG1hcCBo ZWFkLCBjb25zdAogLyogVXNlZCB0byBhY2N1bXVsYXRlIHN0YXRpc3RpY3Mg YWJvdXQgYml0bWFwIHNpemVzLiAgKi8KIHN0cnVjdCBvdXRwdXRfaW5mbwog ewotICBIT1NUX1dJREVTVF9JTlQgc2l6ZTsKLSAgaW50IGNvdW50OworICB1 bnNpZ25lZCBIT1NUX1dJREVTVF9JTlQgc2l6ZTsKKyAgdW5zaWduZWQgSE9T VF9XSURFU1RfSU5UIGNvdW50OwogfTsKIAogLyogQ2FsbGVkIHZpYSBodGFi X3RyYXZlcnNlLiAgT3V0cHV0IGJpdG1hcCBkZXNjcmlwdG9yIHBvaW50ZWQg b3V0IGJ5IFNMT1QKQEAgLTIxNTMsMTAgKzIxNTcsMTQgQEAgcHJpbnRfc3Rh dGlzdGljcyAodm9pZCAqKnNsb3QsIHZvaWQgKmIpCiAJczEgPSBzMiArIDQ7 CiAgICAgICBzcHJpbnRmIChzLCAiJXM6JWkgKCVzKSIsIHMxLCBkLT5saW5l LCBkLT5mdW5jdGlvbik7CiAgICAgICBzWzQxXSA9IDA7Ci0gICAgICBmcHJp bnRmIChzdGRlcnIsICIlLTQxcyAlOGQgJTE1IkhPU1RfV0lERVNUX0lOVF9Q UklOVCJkICUxNSIKLQkgICAgICAgSE9TVF9XSURFU1RfSU5UX1BSSU5UImQg JTE1IkhPU1RfV0lERVNUX0lOVF9QUklOVCJkICUxMGQgJTEwZFxuIiwKLQkg ICAgICAgcywgZC0+Y3JlYXRlZCwgZC0+YWxsb2NhdGVkLCBkLT5wZWFrLCBk LT5jdXJyZW50LCBkLT5uc2VhcmNoZXMsCi0JICAgICAgIGQtPnNlYXJjaF9p dGVyKTsKKyAgICAgIGZwcmludGYgKHN0ZGVyciwKKwkgICAgICAgIiUtNDFz ICU5dSIKKwkgICAgICAgIiAlMTUiSE9TVF9XSURFU1RfSU5UX1BSSU5UImQg JTE1IkhPU1RfV0lERVNUX0lOVF9QUklOVCJkIgorCSAgICAgICAiICUxNSJI T1NUX1dJREVTVF9JTlRfUFJJTlQiZCIKKwkgICAgICAgIiAlMTAiSE9TVF9X SURFU1RfSU5UX1BSSU5UImQgJTEwIkhPU1RfV0lERVNUX0lOVF9QUklOVCJk XG4iLAorCSAgICAgICBzLCBkLT5jcmVhdGVkLAorCSAgICAgICBkLT5hbGxv Y2F0ZWQsIGQtPnBlYWssIGQtPmN1cnJlbnQsCisJICAgICAgIGQtPm5zZWFy Y2hlcywgZC0+c2VhcmNoX2l0ZXIpOwogICAgICAgaS0+c2l6ZSArPSBkLT5h bGxvY2F0ZWQ7CiAgICAgICBpLT5jb3VudCArPSBkLT5jcmVhdGVkOwogICAg IH0KQEAgLTIxNzUsMTUgKzIxODMsMTggQEAgZHVtcF9iaXRtYXBfc3RhdGlz dGljcyAodm9pZCkKICAgaWYgKCFiaXRtYXBfZGVzY19oYXNoKQogICAgIHJl dHVybjsKIAotICBmcHJpbnRmIChzdGRlcnIsICJcbkJpdG1hcCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBPdmVyYWxsICIKLQkJICAg IiAgICAgIEFsbG9jYXRlZCAgICAgICAgICAgIFBlYWsgICAgICAgICAgICBM ZWFrICAgc2VhcmNoZWQgIgotCQkgICAiICBzZWFyY2ggaXRyXG4iKTsKKyAg ZnByaW50ZiAoc3RkZXJyLAorCSAgICJcbiUtNDFzICU5cyAlMTVzICUxNXMg JTE1cyAlMTBzICUxMHNcbiIsCisJICAgIkJpdG1hcCIsICJPdmVyYWxsIiwK KwkgICAiQWxsb2NhdGVkIiwgIlBlYWsiLCAiTGVhayIsCisJICAgInNlYXJj aGVkIiwgInNlYXJjaF9pdHIiKTsKICAgZnByaW50ZiAoc3RkZXJyLCAiLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4iKTsKICAgaW5m by5jb3VudCA9IDA7CiAgIGluZm8uc2l6ZSA9IDA7CiAgIGh0YWJfdHJhdmVy c2UgKGJpdG1hcF9kZXNjX2hhc2gsIHByaW50X3N0YXRpc3RpY3MsICZpbmZv KTsKICAgZnByaW50ZiAoc3RkZXJyLCAiLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tXG4iKTsKLSAgZnByaW50ZiAoc3RkZXJyLCAiJS00 MHMgJTlkICUxNSJIT1NUX1dJREVTVF9JTlRfUFJJTlQiZFxuIiwKKyAgZnBy aW50ZiAoc3RkZXJyLAorCSAgICIlLTQxcyAlOSJIT1NUX1dJREVTVF9JTlRf UFJJTlQiZCAlMTUiSE9TVF9XSURFU1RfSU5UX1BSSU5UImRcbiIsCiAJICAg IlRvdGFsIiwgaW5mby5jb3VudCwgaW5mby5zaXplKTsKICAgZnByaW50ZiAo c3RkZXJyLCAiLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t XG4iKTsKIH0K --bcaec54b4568d943ec04d7499e56--