Merge "Fix the offset of $dexfile debug symbol."
diff --git a/compiler/Android.bp b/compiler/Android.bp
index d4d72f3..01f761b 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -252,9 +252,8 @@
pgo: {
instrumentation: true,
- profile_file: "dex2oat.profdata",
+ profile_file: "art/dex2oat.profdata",
benchmarks: ["dex2oat"],
- enable_profile_use: false,
}
}
diff --git a/compiler/optimizing/code_generator_vector_x86.cc b/compiler/optimizing/code_generator_vector_x86.cc
index ad8128a..7b4b85d 100644
--- a/compiler/optimizing/code_generator_vector_x86.cc
+++ b/compiler/optimizing/code_generator_vector_x86.cc
@@ -92,8 +92,8 @@
__ pshufd(dst, dst, Immediate(0));
break;
case DataType::Type::kInt64: {
- XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
DCHECK_EQ(2u, instruction->GetVectorLength());
+ XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
__ movd(dst, locations->InAt(0).AsRegisterPairLow<Register>());
__ movd(tmp, locations->InAt(0).AsRegisterPairHigh<Register>());
__ punpckldq(dst, tmp);
@@ -101,13 +101,13 @@
break;
}
case DataType::Type::kFloat32:
- DCHECK(locations->InAt(0).Equals(locations->Out()));
DCHECK_EQ(4u, instruction->GetVectorLength());
+ DCHECK(locations->InAt(0).Equals(locations->Out()));
__ shufps(dst, dst, Immediate(0));
break;
case DataType::Type::kFloat64:
- DCHECK(locations->InAt(0).Equals(locations->Out()));
DCHECK_EQ(2u, instruction->GetVectorLength());
+ DCHECK(locations->InAt(0).Equals(locations->Out()));
__ shufpd(dst, dst, Immediate(0));
break;
default:
@@ -160,8 +160,8 @@
__ movd(locations->Out().AsRegister<Register>(), src);
break;
case DataType::Type::kInt64: {
- XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
DCHECK_EQ(2u, instruction->GetVectorLength());
+ XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
__ movd(locations->Out().AsRegisterPairLow<Register>(), src);
__ pshufd(tmp, src, Immediate(1));
__ movd(locations->Out().AsRegisterPairHigh<Register>(), tmp);
@@ -1022,8 +1022,8 @@
__ movd(dst, locations->InAt(0).AsRegister<Register>());
break;
case DataType::Type::kInt64: {
- XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
DCHECK_EQ(2u, instruction->GetVectorLength());
+ XmmRegister tmp = locations->GetTemp(0).AsFpuRegister<XmmRegister>();
__ xorps(tmp, tmp);
__ movd(dst, locations->InAt(0).AsRegisterPairLow<Register>());
__ movd(tmp, locations->InAt(0).AsRegisterPairHigh<Register>());
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index dc71b9b..3a6c86d 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -132,9 +132,8 @@
pgo: {
instrumentation: true,
- profile_file: "dex2oat.profdata",
+ profile_file: "art/dex2oat.profdata",
benchmarks: ["dex2oat"],
- enable_profile_use: false,
cflags: [
// Ignore frame-size increase resulting from instrumentation.
"-Wno-frame-larger-than=",
diff --git a/dex2oat/dex2oat_options.cc b/dex2oat/dex2oat_options.cc
index d9b4ea7..a2e2b48 100644
--- a/dex2oat/dex2oat_options.cc
+++ b/dex2oat/dex2oat_options.cc
@@ -249,8 +249,6 @@
return parser_builder->Build();
}
-#pragma GCC diagnostic pop
-
std::unique_ptr<Dex2oatArgumentMap> Dex2oatArgumentMap::Parse(int argc,
const char** argv,
std::string* error_msg) {
@@ -264,4 +262,5 @@
return std::unique_ptr<Dex2oatArgumentMap>(new Dex2oatArgumentMap(parser.ReleaseArgumentsMap()));
}
+#pragma GCC diagnostic pop
} // namespace art
diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 4f5d810..23ad5fd 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -37,9 +37,8 @@
pgo: {
instrumentation: true,
- profile_file: "dex2oat.profdata",
+ profile_file: "art/dex2oat.profdata",
benchmarks: ["dex2oat"],
- enable_profile_use: false,
}
}