Changeset b45ae02 in git

Timestamp:

Oct 12, 2018, 3:07:52 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c5079ecb99f453ef9b68c8f71391a4d24e9f9122ccc4a179b32a4db6b33e8a45864fd61e8e78aaad

Parents:

a6ea1d3a85e5c6294a5867c84399d54d8f5651ae

Message:

opt: letterpace: move alloc/free out of inner loops

File:

• libpolys/polys/shiftop.cc (modified) (9 diffs)

libpolys/polys/shiftop.cc

@@ -12 +12 @@
  * -> wait until the new interface is released
 */
-#define SHIFT_MULT_COMPAT_MODE 
+#define SHIFT_MULT_COMPAT_MODE
 
 #ifdef SHIFT_MULT_DEBUG
@@ -55 +55 @@
   p_GetExpV(_m,mExpV,ri);
   int mLength = p_mLastVblock(_m, mExpV, ri) * lV;
+  int *pExpV = (int *) omAlloc((ri->N+1)*sizeof(int));
   do
   {
+    memset(pExpV,0,(ri->N+1)*sizeof(int));
     p_AllocBin(pNext(q), bin, ri);
     pIter(q);
     pSetCoeff0(q, n_Mult(mCoeff, pGetCoeff(p), ri->cf));
 
-    int *pExpV = (int *) omAlloc0((ri->N+1)*sizeof(int));
     p_GetExpV(p, pExpV, ri);
     p_LPExpVappend(pExpV, mExpV, p_mLastVblock(p, pExpV, ri) * lV, mLength, ri);
     p_MemCopy_LengthGeneral(q->exp, p->exp, ri->ExpL_Size); // otherwise q is not initialized correctly
     p_SetExpV(q, pExpV, ri);
-    omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
 
     pIter(p);
   }
   while (p != NULL);
+  omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
   omFreeSize((ADDRESS) mExpV, (ri->N+1)*sizeof(int));
   pNext(q) = NULL;
@@ -116 +117 @@
   p_GetExpV(_m,mExpV,ri);
   int mLength = p_mLastVblock(_m, mExpV, ri) * lV;
+  int *pExpV = (int *) omAlloc((ri->N+1)*sizeof(int));
   while (p != NULL)
   {
+    memset(pExpV,0,(ri->N+1)*sizeof(int));
     pCoeff = pGetCoeff(p);
     pSetCoeff0(p, n_Mult(mCoeff, pCoeff, ri->cf));
     n_Delete(&pCoeff, ri->cf); // delete the old coeff
 
-    int *pExpV = (int *) omAlloc0((ri->N+1)*sizeof(int));
     p_GetExpV(p,pExpV,ri);
     p_LPExpVappend(pExpV, mExpV, p_mLastVblock(p, pExpV, ri) * lV, mLength, ri);
     p_SetExpV(p, pExpV, ri);
-    omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
 
     pIter(p);
   }
+  omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
   omFreeSize((ADDRESS) mExpV, (ri->N+1)*sizeof(int));
 #ifdef SHIFT_MULT_COMPAT_MODE
@@ -178 +180 @@
   p_GetExpV(_m,mExpV,ri);
   int mLength = p_mLastVblock(_m, mExpV, ri) * lV;
+  int *pExpV = (int *) omAlloc((ri->N+1)*sizeof(int));
   do
   {
+    memset(pExpV,0,(ri->N+1)*sizeof(int));
     p_AllocBin(pNext(q), bin, ri);
     pIter(q);
     pSetCoeff0(q, n_Mult(mCoeff, pGetCoeff(p), ri->cf));
 
-    int *pExpV = (int *) omAlloc0((ri->N+1)*sizeof(int));
     p_GetExpV(p, pExpV, ri);
     p_LPExpVprepend(pExpV, mExpV, p_mLastVblock(p, pExpV, ri) * lV, mLength, ri);
     p_MemCopy_LengthGeneral(q->exp, p->exp, ri->ExpL_Size); // otherwise q is not initialized correctly
     p_SetExpV(q, pExpV, ri);
-    omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
 
     pIter(p);
   }
   while (p != NULL);
+  omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
   omFreeSize((ADDRESS) mExpV, (ri->N+1)*sizeof(int));
   pNext(q) = NULL;
@@ -239 +242 @@
   p_GetExpV(_m,mExpV,ri);
   int mLength = p_mLastVblock(_m, mExpV, ri) * lV;
+  int *pExpV = (int *) omAlloc((ri->N+1)*sizeof(int));
   while (p != NULL)
   {
+    memset(pExpV,0,(ri->N+1)*sizeof(int));
     pCoeff = pGetCoeff(p);
     pSetCoeff0(p, n_Mult(mCoeff, pCoeff, ri->cf));
     n_Delete(&pCoeff, ri->cf); // delete the old coeff
 
-    int *pExpV = (int *) omAlloc0((ri->N+1)*sizeof(int));
     p_GetExpV(p,pExpV,ri);
     p_LPExpVprepend(pExpV, mExpV, p_mLastVblock(p, pExpV, ri) * lV, mLength, ri);
     p_SetExpV(p, pExpV, ri);
-    omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
 
     pIter(p);
   }
+  omFreeSize((ADDRESS) pExpV, (ri->N+1)*sizeof(int));
   omFreeSize((ADDRESS) mExpV, (ri->N+1)*sizeof(int));
 #ifdef SHIFT_MULT_COMPAT_MODE
@@ -286 +290 @@
 
   int pLen = 0;
-  if (ll >= 0) {
+  if (ll >= 0)
+  {
     pLen = pLength(p);
   }
@@ -292 +297 @@
   p = shift_pp_Mult_mm(p, m, ri);
 
-  if (ll >= 0) {
+  if (ll >= 0)
+  {
     ll = pLen - pLength(p);
-  } else {
+  }
+  else
+  {
     ll = pLength(p);
   }
@@ -516 +524 @@
 
 // prepends m2ExpV to m1ExpV, also adds their components (one of them is always zero)
-void p_LPExpVprepend(int *m1ExpV, int *m2ExpV, int m1Length, int m2Length, const ring ri) {
+void p_LPExpVprepend(int *m1ExpV, int *m2ExpV, int m1Length, int m2Length, const ring ri)
+{
 #ifdef SHIFT_MULT_DEBUG
   PrintLn(); PrintS("Prepend");
@@ -544 +553 @@
 }
 
-void WriteLPExpV(int *expV, ring ri) {
-  for (int i = 0; i <= ri->N; ++i) {
+void WriteLPExpV(int *expV, ring ri)
+{
+  for (int i = 0; i <= ri->N; ++i)
+  {
     Print("%d", expV[i]);
-    if (i == 0) {
+    if (i == 0)
+    {
       Print("| ");
     }
-    if (i % ri->isLPring == 0) {
+    if (i % ri->isLPring == 0)
+    {
       Print(" ");
     }