Merge branch 'main' into msys2

Author: Artoria2e5

README.md

@@ -231,29 +231,34 @@ ECM on Mersenne numbers
 ------------------------
 ECM is a probabilistic generalization of P−1/P+1: it succeeds when the group order on a random curve has a cofactor that’s B1,B2-smooth, so B1/B2 should be chosen for the target factor size.
 
-ECM on Mersenne numbers N = 2^p - 1. Stage 1 multiplies by all prime powers <= B1; Stage 2 scans primes in (B1, B2]. Without flags you get the plain prime-by-prime Stage 2. "-brent d" enables a simplified Brent-Suyama extension by using q^d (a bit more extra reach beyond B2). "-bsgs" batches several multipliers into one ladder call to reduce overhead. Both flags are complementary and can be combined. You can pass pre-known factors via "-factors <list>" (decimal or 0x hex); they are divided out (with multiplicities) before ECM. For p=701, 796337 is a known factor. Runs are checkpointed periodically; re-running the same command resumes safely.
-```
-# Plain ECM on M_p (here p=701)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8
-
-# ECM + batching only (same primes, fewer ladder calls)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -bsgs
-
-# ECM + simplified Brent-Suyama only (q -> q^3 here)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -brent 3
-
-# ECM + both (complementary: q -> q^3 and batched multipliers)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -brent 3 -bsgs
-
-# Provide known factors (e.g., for p=701, factor 796337)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -factors 796337
-
-# Combine known factors with brent+bsgs
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -brent 3 -bsgs -factors 796337
-
-# Resume after interrupt (same command; auto-checkpointed)
-./prmers 701 -ecm -b1 6000 -b2 33333 -K 8 -brent 3 -bsgs -factors 796337
-```
+ECM on Mersenne numbers
+-----------------------
+ECM on N = 2^p - 1.
+
+Curve model and torsion:
+- default: Edwards, torsion 8
+- -montgomery: use Montgomery model
+- -torsion16: force torsion 16
+- -notorsion: no torsion
+
+Outputs:
+- results append to ecm_result.json
+- last curve saved to lastcurve.gp (PARI/GP)
+- checkpoints auto-resume on re-run
+
+Examples:
+  # Stage-1 only
+  ./prmers 701 -ecm -b1 6000 -K 8
+
+  # Enable Stage-2
+  ./prmers 701 -ecm -b1 6000 -b2 33333 -K 8
+
+  # Model / torsion variants
+  ./prmers 701 -ecm -b1 6000 -K 8 -montgomery
+  ./prmers 701 -ecm -b1 6000 -K 8 -torsion16
+  ./prmers 701 -ecm -b1 6000 -K 8 -notorsion
+  ./prmers 701 -ecm -b1 6000 -K 8 -montgomery -torsion16
+  ./prmers 701 -ecm -b1 6000 -K 8 -montgomery -notorsion
 
 
 ## GPU Memory Test (`-memtest`)

docs/ecm_benchmark.txt

@@ -4,7 +4,7 @@
 #include <string>
 
 namespace core {
-    const std::string PRMERS_VERSION = "4.15.03-alpha";
+    const std::string PRMERS_VERSION = "4.15.13-alpha";
 } // namespace core
 
 #endif // VERSION_HPP

include/core/Version.hpp

@@ -34,6 +34,11 @@ struct CliOptions {
     uint64_t gerbicz_error_count = 0;
     uint64_t erroriter = 0;
     bool proof = true;
+    bool edwards = true;
+    bool torsion16 = false;
+    bool notorsion = false;
+    uint64_t sigma = 0ULL;
+    uint64_t seed = 0ULL;
     bool resume = true;
     bool submit = false;
     uint64_t chunk256 = 4;
@@ -66,6 +71,9 @@ struct CliOptions {
     std::string osVersion = "14.0";
     std::string osArch = "x86_64";
     std::string aid = "";
+    std::string sigma_hex = "";
+    uint64_t curve_seed = 0ULL;
+    uint64_t base_seed = 0ULL;
     std::string uid = "";
     int res64_display_interval = 0;
     bool cl_queue_throttle_active = false;
@@ -75,6 +83,7 @@ struct CliOptions {
     std::string http_host = "localhost";
     bool ipv4 = true;
     uint64_t max_e_bits = 268'435'456ULL;
+    uint64_t curves_tested_for_found = 0;
 
 };
 

include/io/CliParser.hpp

@@ -11,13 +11,15 @@ struct WorktodoEntry {
     bool prpTest   = false;
     bool llTest    = false;
     bool pm1Test   = false; 
+    bool ecmTest   = false; 
     uint32_t exponent = 0;
     std::string aid;
     std::string rawLine;  
     std::vector<std::string> knownFactors;  
     uint32_t residueType = 1;               
     uint64_t B1 = 0;                       
     uint64_t B2 = 0;
+    uint64_t curves = 0;
 };
 
 class WorktodoParser {

include/io/WorktodoParser.hpp

@@ -253,50 +253,63 @@ App::App(int argc, char** argv)
   : argc_(argc)
   , argv_(argv)
   ,options([&]{
-     std::vector<std::string> merged;
-      merged.push_back(argv[0]);
-      for (int i = 1; i < argc; ++i) {
-          if (std::strcmp(argv[i], "-config") == 0 && i+1 < argc) {
-              auto cfg_args = parseConfigFile(argv[i+1]);
-              merged.insert(merged.end(), cfg_args.begin(), cfg_args.end());
-              i++;
-          } else {
-              merged.emplace_back(argv[i]);
-          }
-      }
-
-      std::vector<char*> c_argv;
-      for (auto& s : merged)
-          c_argv.push_back(const_cast<char*>(s.c_str()));
-      c_argv.push_back(nullptr);
-      auto o = io::CliParser::parse(static_cast<int>(merged.size()), c_argv.data());
-
-      io::WorktodoParser wp{o.worktodo_path};
-      if (auto e = wp.parse()) {
-            o.exponent     = e->exponent;
-            o.mode         = e->prpTest ? "prp" : (e->llTest ? "ll" : (e->pm1Test ? "pm1" : ""));
-            o.aid          = e->aid;
-            o.knownFactors = e->knownFactors;
-            if (e->pm1Test) {
-                o.B1 = e->B1;
-                o.B2 = e->B2;
-            }
-            hasWorktodoEntry_ = true;
-      }
-
-      if (!hasWorktodoEntry_ && o.exponent == 0) {
-        std::cerr << "Error: no valid entry in " 
-                  << options.worktodo_path 
-                  << " and no exponent provided on the command line\n";
-                  
-        
-        if (!options.gui) {
-            o.exponent = static_cast<uint64_t>(askExponentInteractively());
+    std::vector<std::string> merged;
+    merged.push_back(argv[0]);
+    for (int i = 1; i < argc; ++i) {
+        if (std::strcmp(argv[i], "-config") == 0 && i+1 < argc) {
+            auto cfg_args = parseConfigFile(argv[i+1]);
+            merged.insert(merged.end(), cfg_args.begin(), cfg_args.end());
+            i++;
+        } else {
+            merged.emplace_back(argv[i]);
         }
-        o.mode = "prp";
-        //std::exit(-1);
-      }
-      return o;
+    }
+
+    std::vector<char*> c_argv;
+    for (auto& s : merged)
+        c_argv.push_back(const_cast<char*>(s.c_str()));
+    c_argv.push_back(nullptr);
+    auto o = io::CliParser::parse(static_cast<int>(merged.size()), c_argv.data());
+
+    io::WorktodoParser wp{o.worktodo_path};
+    if (auto e = wp.parse()) {
+        o.exponent     = e->exponent;
+        o.mode         = e->ecmTest ? "ecm"
+                        : (e->prpTest ? "prp"
+                        : (e->llTest ? "ll"
+                        : (e->pm1Test ? "pm1" : "")));
+        o.aid          = e->aid;
+        o.knownFactors = e->knownFactors;
+
+        if (e->pm1Test) {
+            o.B1 = e->B1;
+            o.B2 = e->B2;
+        }
+
+        if (e->ecmTest) {
+            o.B1  = e->B1;
+            o.B2  = e->B2;
+            o.nmax = e->curves;
+            o.K    = e->curves;
+        }
+
+        hasWorktodoEntry_ = true;
+    }
+
+
+    if (!hasWorktodoEntry_ && o.exponent == 0) {
+    std::cerr << "Error: no valid entry in " 
+                << options.worktodo_path 
+                << " and no exponent provided on the command line\n";
+                
+    
+    if (!options.gui) {
+        o.exponent = static_cast<uint64_t>(askExponentInteractively());
+    }
+    o.mode = "prp";
+    //std::exit(-1);
+    }
+    return o;
   }())
   , context(options.device_id,
         static_cast<std::size_t>(options.enqueue_max),
@@ -819,7 +832,7 @@ int App::run() {
             bool haveS1 = File(s1f).exists() || File(s1f + ".old").exists();
             bool haveS2 = File(s2f).exists() || File(s2f + ".old").exists() || File(s2f + ".new").exists();
 
-            if ((haveS2 || haveS1) && options.nmax == 0  && options.K == 0) {
+            if ((haveS2) && options.nmax == 0  && options.K == 0) {
                 std::ostringstream msg;
                 msg << "Detected P-1 checkpoint(s): "
                     << (haveS2 ? "[Stage 2] " : "")
@@ -831,6 +844,14 @@ int App::run() {
                 rc_local = runPM1Stage2Marin();
                 ran_local = true;
             } else {
+                if(haveS1){
+                    std::ostringstream msg;
+                    msg << "Detected P-1 checkpoint(s): "
+                    << (haveS2 ? "[Stage 2] " : "")
+                    << (haveS1 ? "[Stage 1] " : "")
+                    << "→ jumping to Stage1()";
+                    std::cout << msg.str() << std::endl;
+                }
                 std::string msg = "No P-1 checkpoints found → running Stage 1 (runPM1Marin)";
                 std::cout << msg << std::endl;
                 if (guiServer_) { guiServer_->appendLog(msg); guiServer_->setStatus("Running P-1 Stage 1"); }

src/core/App.cpp

@@ -82,8 +82,12 @@ void printUsage(const char* progName) {
     std::cout << "  -checklevel <value>  : (Optional) Will force gerbicz check every B*<value> by default check is done every 10 min and at the end." << std::endl;
     std::cout << "  -wagstaff            : (Optional) will check PRP if (2^p + 1)/3 is probably prime" << std::endl;
     std::cout << "  -ecm -b1 <B1> [-b2 <B2>] -K <curves> : Run ECM factoring with bounds B1 [and optional B2], on given number of curves" << std::endl;
-    std::cout << "  -brent [<d>]         : (Optional) use Brent-Suyama variant with default or specified degree d (e.g., -brent 6)" << std::endl;
-    std::cout << "  -bsgs                : (Optional) enable batching of multipliers in ECM stage 2 to reduce ladder calls" << std::endl;
+    std::cout << "  -montgomery          : (Optional) use Montgomery instead of twisted Edwards curve" << std::endl;
+    std::cout << "  -edwards             : (Optional) use twisted Edwards curve" << std::endl;
+    std::cout << "  -torsion16           : (Optional) use torsion-16 instead of default torsion-8" << std::endl;
+    std::cout << "  -notorsion           : (Optional) use no torsion instead of default torsion-8" << std::endl;
+    //std::cout << "  -brent [<d>]         : (Optional) use Brent-Suyama variant with default or specified degree d (e.g., -brent 6)" << std::endl;
+    //std::cout << "  -bsgs                : (Optional) enable batching of multipliers in ECM stage 2 to reduce ladder calls" << std::endl;
     std::cout << "  -marin               : (Optional) deactivate use of marin backend" << std::endl;
     std::cout << "  -resume              : (Optional) write GMP-ECM and Prime 95 resume file after P-1 stage 1" << std::endl;
     //std::cout << "  -p95                 : (Optional) write Prime 95 resume file after P-1 stage 1" << std::endl;
@@ -188,6 +192,18 @@ CliOptions CliParser::parse(int argc, char** argv ) {
         else if (std::strcmp(argv[i], "-marin") == 0) {
             opts.marin = false;
         }
+        else if (std::strcmp(argv[i], "-montgomery") == 0) {
+            opts.edwards = false;
+        }
+        else if (std::strcmp(argv[i], "-edwards") == 0) {
+            opts.edwards = true;
+        }
+        else if (std::strcmp(argv[i], "-torsion16") == 0) {
+            opts.torsion16 = true;
+        }
+        else if (std::strcmp(argv[i], "-notorsion") == 0) {
+            opts.notorsion = true;
+        }
         else if (std::strcmp(argv[i], "-submit") == 0) {
             opts.submit = true;
         }