From: Bassam Tabbara <bassam.tabbara@quantum.com>
Date: Thu, 22 Sep 2016 19:25:16 +0000 (-0700)
Subject: erasure-code: improve non-regression testing
X-Git-Tag: v11.0.1~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=feb224d7e179f0681e6d4454f20a2a930e001d8a;p=ceph.git

erasure-code: improve non-regression testing

Pickup new ec corpus with improved testing.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
---

diff --git a/ceph-erasure-code-corpus b/ceph-erasure-code-corpus
index c33227908285..b5c863495c16 160000
--- a/ceph-erasure-code-corpus
+++ b/ceph-erasure-code-corpus
@@ -1 +1 @@
-Subproject commit c332279082854effc00ea93c226f2f211f73631d
+Subproject commit b5c863495c16975478aa5fc2ca33293c2e0c1a5f
diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt
index 3225b6b99e11..88c1ca40da8b 100644
--- a/src/erasure-code/jerasure/CMakeLists.txt
+++ b/src/erasure-code/jerasure/CMakeLists.txt
@@ -35,6 +35,13 @@ if(HAVE_INTEL_SSE4_2)
   list(APPEND GF_COMPILE_FLAGS INTEL_SSE4)
 endif()
 
+# set this to TRUE to enable debugging of SIMD detection
+# inside gf-complete. gf-complete will printf the SIMD
+# instructions detected to stdout.
+if (FALSE)
+  list(APPEND GF_COMPILE_FLAGS DEBUG_CPU_DETECTION)
+endif()
+
 set(gf-complete_srcs
   gf-complete/src/gf_cpu.c
   gf-complete/src/gf_wgen.c
@@ -59,7 +66,7 @@ endif()
 
 add_library(gf-complete_objs OBJECT ${gf-complete_srcs})
 set_target_properties(gf-complete_objs PROPERTIES 
-  COMPILE_FLAGS ${SIMD_COMPILE_FLAGS})
+  COMPILE_FLAGS "${SIMD_COMPILE_FLAGS}")
 set_target_properties(gf-complete_objs PROPERTIES 
   COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
 
diff --git a/src/test/erasure-code/ceph_erasure_code_non_regression.cc b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
index dc4602529beb..5414cfba4def 100644
--- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc
+++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
@@ -40,14 +40,12 @@ class ErasureCodeNonRegression {
   string plugin;
   bool create;
   bool check;
-  bool show_path;
   string base;
   string directory;
   ErasureCodeProfile profile;
 public:
   int setup(int argc, char** argv);
   int run();
-  int run_show_path();
   int run_create();
   int run_check();
   int decode_erasures(ErasureCodeInterfaceRef erasure_code,
@@ -70,8 +68,6 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) {
      "prefix all paths with base")
     ("parameter,P", po::value<vector<string> >(),
      "add a parameter to the erasure code profile")
-    ("path", po::value<string>(), "content path instead of inferring it from parameters")
-    ("show-path", "display the content path and exit")
     ("create", "create the erasure coded content in the directory")
     ("check", "check the content in the directory matches the chunks and vice versa")
     ;
@@ -114,10 +110,9 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) {
   base = vm["base"].as<string>();
   check = vm.count("check") > 0;
   create = vm.count("create") > 0;
-  show_path = vm.count("show-path") > 0;
 
-  if (!check && !create && !show_path) {
-    cerr << "must specifify either --check, --create or --show-path" << endl;
+  if (!check && !create) {
+    cerr << "must specifify either --check, or --create" << endl;
     return 1;
   }
 
@@ -143,9 +138,6 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) {
     }
   }
 
-  if (vm.count("path"))
-    directory = vm["path"].as<string>();
-
   return 0;
 }
 
@@ -156,17 +148,9 @@ int ErasureCodeNonRegression::run()
     return ret;
   if(check && (ret = run_check()))
     return ret;
-  if(show_path && (ret = run_show_path()))
-    return ret;
   return ret;
 }
 
-int ErasureCodeNonRegression::run_show_path()
-{
-  cout << directory << endl;
-  return 0;
-}
-
 int ErasureCodeNonRegression::run_create()
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();