Merge "Get llvm performance back." into ics-mr1-plus-art
diff --git a/src/mutex.h b/src/mutex.h
index b019f68..e89e2ec 100644
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -63,8 +63,8 @@
uint32_t GetDepth();
pthread_mutex_t mutex_;
- std::string name_;
- MutexRank rank_;
+ const std::string name_;
+ const MutexRank rank_;
friend class ConditionVariable;
friend class MutexTester;
diff --git a/src/runtime.cc b/src/runtime.cc
index 37c9dce..74f6652 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -111,10 +111,7 @@
delete class_linker_;
delete heap_;
-#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
- verifier::MethodVerifier::DeleteInferredRegCategoryMaps();
-#endif
- verifier::MethodVerifier::DeleteGcMaps();
+ verifier::MethodVerifier::Shutdown();
delete intern_table_;
delete java_vm_;
Thread::Shutdown();
@@ -658,11 +655,7 @@
thread_list_ = new ThreadList;
intern_table_ = new InternTable;
- verifier::MethodVerifier::InitGcMaps();
-
-#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
- verifier::MethodVerifier::InitInferredRegCategoryMaps();
-#endif
+ verifier::MethodVerifier::Init();
heap_ = new Heap(options->heap_initial_size_,
options->heap_growth_limit_,
diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index 3e3808f..7140cca 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -3289,26 +3289,6 @@
}
}
-Mutex* MethodVerifier::gc_maps_lock_ = NULL;
-MethodVerifier::GcMapTable* MethodVerifier::gc_maps_ = NULL;
-
-void MethodVerifier::InitGcMaps() {
- gc_maps_lock_ = new Mutex("verifier GC maps lock");
- MutexLock mu(*gc_maps_lock_);
- gc_maps_ = new MethodVerifier::GcMapTable;
-}
-
-void MethodVerifier::DeleteGcMaps() {
- {
- MutexLock mu(*gc_maps_lock_);
- STLDeleteValues(gc_maps_);
- delete gc_maps_;
- gc_maps_ = NULL;
- }
- delete gc_maps_lock_;
- gc_maps_lock_ = NULL;
-}
-
void MethodVerifier::SetGcMap(Compiler::MethodReference ref, const std::vector<uint8_t>& gc_map) {
MutexLock mu(*gc_maps_lock_);
GcMapTable::iterator it = gc_maps_->find(ref);
@@ -3330,26 +3310,78 @@
return it->second;
}
-static Mutex& GetRejectedClassesLock() {
- static Mutex rejected_classes_lock("verifier rejected classes lock");
- return rejected_classes_lock;
+Mutex* MethodVerifier::gc_maps_lock_ = NULL;
+MethodVerifier::GcMapTable* MethodVerifier::gc_maps_ = NULL;
+
+Mutex* MethodVerifier::rejected_classes_lock_ = NULL;
+MethodVerifier::RejectedClassesTable* MethodVerifier::rejected_classes_ = NULL;
+
+#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
+Mutex* MethodVerifier::inferred_reg_category_maps_lock_ = NULL;
+MethodVerifier::InferredRegCategoryMapTable* MethodVerifier::inferred_reg_category_maps_ = NULL;
+#endif
+
+void MethodVerifier::Init() {
+ gc_maps_lock_ = new Mutex("verifier GC maps lock");
+ {
+ MutexLock mu(*gc_maps_lock_);
+ gc_maps_ = new MethodVerifier::GcMapTable;
+ }
+
+ rejected_classes_lock_ = new Mutex("verifier rejected classes lock");
+ {
+ MutexLock mu(*rejected_classes_lock_);
+ rejected_classes_ = new MethodVerifier::RejectedClassesTable;
+ }
+
+#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
+ inferred_reg_category_maps_lock_ = new Mutex("verifier GC maps lock");
+ {
+ MutexLock mu(*inferred_reg_category_maps_lock_);
+ inferred_reg_category_maps_ = new MethodVerifier::InferredRegCategoryMapTable;
+ }
+#endif
}
-static std::set<Compiler::ClassReference>& GetRejectedClasses() {
- static std::set<Compiler::ClassReference> rejected_classes;
- return rejected_classes;
+void MethodVerifier::Shutdown() {
+ {
+ MutexLock mu(*gc_maps_lock_);
+ STLDeleteValues(gc_maps_);
+ delete gc_maps_;
+ gc_maps_ = NULL;
+ }
+ delete gc_maps_lock_;
+ gc_maps_lock_ = NULL;
+
+ {
+ MutexLock mu(*rejected_classes_lock_);
+ delete rejected_classes_;
+ rejected_classes_ = NULL;
+ }
+ delete rejected_classes_lock_;
+ rejected_classes_lock_ = NULL;
+
+#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
+ {
+ MutexLock mu(*inferred_reg_category_maps_lock_);
+ STLDeleteValues(inferred_reg_category_maps_);
+ delete inferred_reg_category_maps_;
+ inferred_reg_category_maps_ = NULL;
+ }
+ delete inferred_reg_category_maps_lock_;
+ inferred_reg_category_maps_lock_ = NULL;
+#endif
}
void MethodVerifier::AddRejectedClass(Compiler::ClassReference ref) {
- MutexLock mu(GetRejectedClassesLock());
- GetRejectedClasses().insert(ref);
+ MutexLock mu(*rejected_classes_lock_);
+ rejected_classes_->insert(ref);
CHECK(IsClassRejected(ref));
}
bool MethodVerifier::IsClassRejected(Compiler::ClassReference ref) {
- MutexLock mu(GetRejectedClassesLock());
- std::set<Compiler::ClassReference>& rejected_classes(GetRejectedClasses());
- return (rejected_classes.find(ref) != rejected_classes.end());
+ MutexLock mu(*rejected_classes_lock_);
+ return (rejected_classes_->find(ref) != rejected_classes_->end());
}
#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
@@ -3398,27 +3430,6 @@
return table.release();
}
-Mutex* MethodVerifier::inferred_reg_category_maps_lock_ = NULL;
-MethodVerifier::InferredRegCategoryMapTable* MethodVerifier::inferred_reg_category_maps_ = NULL;
-
-void MethodVerifier::InitInferredRegCategoryMaps() {
- inferred_reg_category_maps_lock_ = new Mutex("verifier GC maps lock");
- MutexLock mu(*inferred_reg_category_maps_lock_);
- inferred_reg_category_maps_ = new MethodVerifier::InferredRegCategoryMapTable;
-}
-
-void MethodVerifier::DeleteInferredRegCategoryMaps() {
- {
- MutexLock mu(*inferred_reg_category_maps_lock_);
- STLDeleteValues(inferred_reg_category_maps_);
- delete inferred_reg_category_maps_;
- inferred_reg_category_maps_ = NULL;
- }
- delete inferred_reg_category_maps_lock_;
- inferred_reg_category_maps_lock_ = NULL;
-}
-
-
void MethodVerifier::SetInferredRegCategoryMap(Compiler::MethodReference ref,
const InferredRegCategoryMap& inferred_reg_category_map) {
MutexLock mu(*inferred_reg_category_maps_lock_);
diff --git a/src/verifier/method_verifier.h b/src/verifier/method_verifier.h
index 2e4b33f..75dcbc7 100644
--- a/src/verifier/method_verifier.h
+++ b/src/verifier/method_verifier.h
@@ -199,13 +199,12 @@
void Dump(std::ostream& os);
static const std::vector<uint8_t>* GetGcMap(Compiler::MethodReference ref);
- static void InitGcMaps();
- static void DeleteGcMaps();
+
+ static void Init();
+ static void Shutdown();
#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
static const InferredRegCategoryMap* GetInferredRegCategoryMap(Compiler::MethodReference ref);
- static void InitInferredRegCategoryMaps();
- static void DeleteInferredRegCategoryMaps();
#endif
static bool IsClassRejected(Compiler::ClassReference ref);
@@ -577,8 +576,12 @@
static GcMapTable* gc_maps_;
static void SetGcMap(Compiler::MethodReference ref, const std::vector<uint8_t>& gc_map);
+ typedef std::set<Compiler::ClassReference> RejectedClassesTable;
+ static Mutex* rejected_classes_lock_;
+ static RejectedClassesTable* rejected_classes_;
+
#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
- // All the inferred register category maps that the verifier has created
+ // All the inferred register category maps that the verifier has created.
typedef SafeMap<const Compiler::MethodReference,
const InferredRegCategoryMap*> InferredRegCategoryMapTable;
static Mutex* inferred_reg_category_maps_lock_;
diff --git a/test/run-test b/test/run-test
index 38f8f83..7e99c04 100755
--- a/test/run-test
+++ b/test/run-test
@@ -256,7 +256,7 @@
echo ' '
fi
echo "${TEST_NAME} files left in ${tmp_dir} on host"
- if [ "$host_mode" = "yes" ]; then
+ if [ "$host_mode" = "no" ]; then
echo "and in ${DEX_LOCATION} on target"
fi
