From d677d888677bccd0dfc12527c8f40b2c9903c70c Mon Sep 17 00:00:00 2001 From: Qin Zhao Date: Fri, 10 Jun 2016 00:48:53 +0000 Subject: [PATCH] [esan|cfrag] Disable load/store instrumentation for cfrag Summary: Adds ClInstrumentFastpath option to control fastpath instrumentation. Avoids the load/store instrumentation for the cache fragmentation tool. Renames cache_frag_basic.ll to working_set_slow.ll for slowpath instrumentation test. Adds the __esan_init check in struct_field_count_basic.ll. Reviewers: aizatsky Subscribers: llvm-commits, bruening, eugenis, kcc, zhaoqin, vitalybuka Differential Revision: http://reviews.llvm.org/D21079 llvm-svn: 272355 --- .../Transforms/Instrumentation/EfficiencySanitizer.cpp | 10 +++++++--- .../EfficiencySanitizer/struct_field_count_basic.ll | 10 +++++++++- .../{cache_frag_basic.ll => working_set_slow.ll} | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) rename llvm/test/Instrumentation/EfficiencySanitizer/{cache_frag_basic.ll => working_set_slow.ll} (95%) diff --git a/llvm/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp index 48a9396a9562..63391b373c5d 100644 --- a/llvm/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/EfficiencySanitizer.cpp @@ -56,6 +56,9 @@ static cl::opt ClInstrumentLoadsAndStores( static cl::opt ClInstrumentMemIntrinsics( "esan-instrument-memintrinsics", cl::init(true), cl::desc("Instrument memintrinsics (memset/memcpy/memmove)"), cl::Hidden); +static cl::opt ClInstrumentFastpath( + "esan-instrument-fastpath", cl::init(true), + cl::desc("Instrument fastpath"), cl::Hidden); // Experiments show that the performance difference can be 2x or more, // and accuracy loss is typically negligible, so we turn this on by default. @@ -591,7 +594,8 @@ bool EfficiencySanitizer::instrumentLoadOrStore(Instruction *I, {IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()), ConstantInt::get(IntptrTy, TypeSizeBytes)}); } else { - if (instrumentFastpath(I, DL, IsStore, Addr, Alignment)) { + if (ClInstrumentFastpath && + instrumentFastpath(I, DL, IsStore, Addr, Alignment)) { NumFastpaths++; return true; } @@ -708,8 +712,8 @@ bool EfficiencySanitizer::instrumentFastpathCacheFrag(Instruction *I, const DataLayout &DL, Value *Addr, unsigned Alignment) { - // TODO(bruening): implement a fastpath for aligned accesses - return false; + // Do nothing. + return true; // Return true to avoid slowpath instrumentation. } bool EfficiencySanitizer::instrumentFastpathWorkingSet( diff --git a/llvm/test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll b/llvm/test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll index 158a79ed7522..5cc5f0622308 100644 --- a/llvm/test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll +++ b/llvm/test/Instrumentation/EfficiencySanitizer/struct_field_count_basic.ll @@ -1,6 +1,6 @@ ; Test basic EfficiencySanitizer struct field count instrumentation. ; -; RUN: opt < %s -esan -esan-cache-frag -esan-instrument-loads-and-stores=false -esan-instrument-memintrinsics=false -S | FileCheck %s +; RUN: opt < %s -esan -esan-cache-frag -S | FileCheck %s %struct.A = type { i32, i32 } %union.U = type { double } @@ -93,3 +93,11 @@ entry: ; CHECK-NEXT: %k1 = load %struct.A*, %struct.A** %k, align 8 ; CHECK-NEXT: %arrayidx13 = getelementptr inbounds %struct.A, %struct.A* %k1, i64 0 ; CHECK-NEXT: ret i32 0 + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Top-level: + +; CHECK: define internal void @esan.module_ctor() +; CHECK: call void @__esan_init(i32 1, i8* bitcast ({ i8*, i32, { i8*, i32, i64*, i8** }* }* @21 to i8*)) +; CHECK: define internal void @esan.module_dtor() +; CHECK: call void @__esan_exit(i8* bitcast ({ i8*, i32, { i8*, i32, i64*, i8** }* }* @21 to i8*)) diff --git a/llvm/test/Instrumentation/EfficiencySanitizer/cache_frag_basic.ll b/llvm/test/Instrumentation/EfficiencySanitizer/working_set_slow.ll similarity index 95% rename from llvm/test/Instrumentation/EfficiencySanitizer/cache_frag_basic.ll rename to llvm/test/Instrumentation/EfficiencySanitizer/working_set_slow.ll index 4cd22690cb86..1c5978e52864 100644 --- a/llvm/test/Instrumentation/EfficiencySanitizer/cache_frag_basic.ll +++ b/llvm/test/Instrumentation/EfficiencySanitizer/working_set_slow.ll @@ -1,6 +1,6 @@ -; Test basic EfficiencySanitizer cache frag instrumentation. +; Test basic EfficiencySanitizer slowpath instrumentation. ; -; RUN: opt < %s -esan -esan-cache-frag -S | FileCheck %s +; RUN: opt < %s -esan -esan-working-set -esan-instrument-fastpath=false -S | FileCheck %s ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Aligned loads: @@ -254,6 +254,6 @@ entry: ; Top-level: ; CHECK: define internal void @esan.module_ctor() -; CHECK: call void @__esan_init(i32 1, i8* bitcast ({ i8*, i32, { i8*, i32, i64*, i8** }* }* @1 to i8*)) +; CHECK: call void @__esan_init(i32 2, i8* null) ; CHECK: define internal void @esan.module_dtor() -; CHECK: call void @__esan_exit(i8* bitcast ({ i8*, i32, { i8*, i32, i64*, i8** }* }* @1 to i8*)) +; CHECK: call void @__esan_exit(i8* null)