From df4a1bb5025e3bd3b5e1366c44148c2f0d58d57d Mon Sep 17 00:00:00 2001 From: torvald Date: Sun, 8 Jan 2012 14:13:49 +0000 Subject: libitm: Optimize undo log. libitm/ * local.cc (GTM_LB): Use GTM::gtm_undolog. (GTM::gtm_thread::drop_references_undolog): Remove. (GTM::gtm_thread::commit_undolog, GTM::gtm_thread::rollback_undolog): Move to ... * libitm_i.h (GTM::gtm_undolog): ...here. New. (GTM::gtm_undolog_entry): Remove. (GTM::gtm_thread): Adapt. * beginend.cc (GTM::gtm_thread::rollback): Adapt. (GTM::gtm_thread::trycommit): Adapt. * method-serial.cc (serial_dispatch::log): Adapt. * method-gl.cc (gl_wt_dispatch::pre_write): Adapt. (gl_wt_dispatch::store): Fix likely/unlikely. * containers.h (GTM::vector::resize): Add additional_capacity parameter and handle it. (GTM::vector::resize_noinline): New/adapt. (GTM::vector::push): New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182992 138bc75d-0d04-0410-961f-82ee72b054a4 --- libitm/containers.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'libitm/containers.h') diff --git a/libitm/containers.h b/libitm/containers.h index e8aa94bb4f42..394b6f2508ec 100644 --- a/libitm/containers.h +++ b/libitm/containers.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 Free Software Foundation, Inc. +/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. Contributed by Torvald Riegel . This file is part of the GNU Transactional Memory Library (libitm). @@ -70,17 +70,24 @@ class vector } ~vector() { if (m_capacity) free(entries); } - void resize() + void resize(size_t additional_capacity) { - if (m_capacity >= default_resize_max) - m_capacity = m_capacity + default_resize_max; + size_t target = m_capacity + additional_capacity; + if (target > default_resize_max) + m_capacity = ((target - 1 + default_resize_max) / default_resize_max) + * default_resize_max; else - m_capacity = m_capacity * 2; + while (m_capacity < target) + m_capacity = m_capacity * 2; if (m_capacity < default_resize_min) m_capacity = default_resize_min; entries = (T*) xrealloc(entries, sizeof(T) * m_capacity, alloc_separate_cl); } - void resize_noinline() __attribute__((noinline)) { resize(); } + void resize_noinline() __attribute__((noinline)) { resize(1); } + void resize_noinline(size_t elements) __attribute__((noinline)) + { + resize(elements); + } size_t size() const { return m_size; } size_t capacity() const { return this->capacity; } @@ -93,6 +100,15 @@ class vector return &entries[m_size++]; } + iterator push(size_t elements) + { + // We don't want inlining here since push() is often on the fast path. + if (unlikely(m_size + elements > m_capacity)) resize_noinline(elements); + iterator it = &entries[m_size]; + m_size += elements; + return it; + } + iterator pop() { if (likely(m_size > 0)) { -- cgit v1.2.3