From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH v2 01/11] tmem: cleanup: drop COMPARE_COPY_PAGE_SSE2 Date: Fri, 8 Nov 2013 09:03:47 +0800 Message-ID: <1383872637-15486-2-git-send-email-bob.liu@oracle.com> References: <1383872637-15486-1-git-send-email-bob.liu@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeaUv-00054D-A6 for xen-devel@lists.xenproject.org; Fri, 08 Nov 2013 01:04:29 +0000 Received: by mail-pb0-f50.google.com with SMTP id uo15so1388775pbc.37 for ; Thu, 07 Nov 2013 17:04:25 -0800 (PST) In-Reply-To: <1383872637-15486-1-git-send-email-bob.liu@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Bob Liu , keir@xen.org, ian.campbell@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org COMPARE_COPY_PAGE_SSE2 never be used in other place, memcpy() is enough. Signed-off-by: Bob Liu --- xen/common/tmem.c | 14 -------------- xen/common/tmem_xen.c | 35 ----------------------------------- 2 files changed, 49 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index a122651..215722b 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -95,14 +95,7 @@ DECL_CYC_COUNTER(non_succ_get); DECL_CYC_COUNTER(non_succ_put); DECL_CYC_COUNTER(flush); DECL_CYC_COUNTER(flush_obj); -#ifdef COMPARE_COPY_PAGE_SSE2 -EXTERN_CYC_COUNTER(pg_copy1); -EXTERN_CYC_COUNTER(pg_copy2); -EXTERN_CYC_COUNTER(pg_copy3); -EXTERN_CYC_COUNTER(pg_copy4); -#else EXTERN_CYC_COUNTER(pg_copy); -#endif DECL_CYC_COUNTER(compress); DECL_CYC_COUNTER(decompress); @@ -2172,14 +2165,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,non_succ_put,"p"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush,"F"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush_obj,"O"); -#ifdef COMPARE_COPY_PAGE_SSE2 - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy1,"1"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy2,"2"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy3,"3"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy4,"4"); -#else n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy,"C"); -#endif n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,compress,"c"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,decompress,"d"); n--; /* overwrite trailing comma */ diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 54ec09f..4725558 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -36,14 +36,7 @@ integer_param("tmem_lock", opt_tmem_lock); EXPORT atomic_t freeable_page_count = ATOMIC_INIT(0); -#ifdef COMPARE_COPY_PAGE_SSE2 -DECL_CYC_COUNTER(pg_copy1); -DECL_CYC_COUNTER(pg_copy2); -DECL_CYC_COUNTER(pg_copy3); -DECL_CYC_COUNTER(pg_copy4); -#else DECL_CYC_COUNTER(pg_copy); -#endif /* these are a concurrency bottleneck, could be percpu and dynamically * allocated iff opt_tmem_compress */ @@ -53,40 +46,12 @@ static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, workmem); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, dstmem); static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); -#ifdef COMPARE_COPY_PAGE_SSE2 -#include /* REMOVE ME AFTER TEST */ -#include /* REMOVE ME AFTER TEST */ -#endif void tmh_copy_page(char *to, char*from) { -#ifdef COMPARE_COPY_PAGE_SSE2 - DECL_LOCAL_CYC_COUNTER(pg_copy1); - DECL_LOCAL_CYC_COUNTER(pg_copy2); - DECL_LOCAL_CYC_COUNTER(pg_copy3); - DECL_LOCAL_CYC_COUNTER(pg_copy4); - *to = *from; /* don't measure TLB misses */ - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy1); - copy_page_sse2(to, from); /* cold cache */ - END_CYC_COUNTER(pg_copy1); - START_CYC_COUNTER(pg_copy2); - copy_page_sse2(to, from); /* hot cache */ - END_CYC_COUNTER(pg_copy2); - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy3); - memcpy(to, from, PAGE_SIZE); /* cold cache */ - END_CYC_COUNTER(pg_copy3); - START_CYC_COUNTER(pg_copy4); - memcpy(to, from, PAGE_SIZE); /* hot cache */ - END_CYC_COUNTER(pg_copy4); -#else DECL_LOCAL_CYC_COUNTER(pg_copy); START_CYC_COUNTER(pg_copy); memcpy(to, from, PAGE_SIZE); END_CYC_COUNTER(pg_copy); -#endif } #if defined(CONFIG_ARM) -- 1.7.10.4