Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize unitialized values for repeated calls #1419

Merged
merged 7 commits into from
Jan 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions driver/others/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,7 @@ void gotoblas_affinity_init(void) {
}
#else
common->num_procs = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
}
#endif

#endif
Expand Down
2 changes: 1 addition & 1 deletion driver/others/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ int get_num_procs(void) {
cpu_set_t *cpusetp;
size_t size;
int ret;
int i,n;
// int i,n;

if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF);
#if !defined(OS_LINUX)
Expand Down
6 changes: 4 additions & 2 deletions kernel/generic/laswp_ncopy_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*b2 = A2;
*b4 = A4;
}
} else
} else {
if (b1 == a2) {
if (b2 == a2) {
*(buffer + 0) = A2;
Expand All @@ -139,7 +139,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*(buffer + 3) = A4;
*b1 = A1;
*b3 = A3;
} else
} else {
if (b2 == b1) {
*(buffer + 0) = B1;
*(buffer + 1) = B3;
Expand All @@ -157,6 +157,8 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*b3 = A3;
*b4 = A4;
}
}
}
}

buffer += 4;
Expand Down
26 changes: 7 additions & 19 deletions kernel/generic/trmm_ltcopy_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,30 +120,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
ao2 += 1; */
b += 2;
} else
#ifdef UNIT
if (X < posY) {
data01 = *(ao1 + 0);
data02 = *(ao1 + 1);

b[ 0] = data01;
b[ 1] = data02;
// ao1 += lda;
b += 2;
} else {
#endif
b[ 0] = *(ao1 + 0);
#ifdef UNIT
data02 = *(ao1 + 1);
} else {

b[ 0] = ONE;
b[ 1] = data02;
#else
data01 = *(ao1 + 0);
data02 = *(ao1 + 1);

b[ 0] = data01;
b[ 1] = data02;
#endif
// ao1 += 2;
b += 2;
}
#endif
b[ 1] = *(ao1 + 1);
b += 2;
}

posY += 2;
Expand Down
37 changes: 9 additions & 28 deletions kernel/generic/trmm_ltcopy_4.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,36 +410,17 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON

i = (m & 1);
if (i) {

if (X > posY) {
/* ao1 += 1;
ao2 += 1; */

b += 2;
} else
if (X < posY) {
data01 = *(ao1 + 0);
data02 = *(ao1 + 1);

b[ 0] = data01;
b[ 1] = data02;
// ao1 += lda;
b += 2;
} else {
#ifdef UNIT
data02 = *(ao1 + 1);

b[ 0] = ONE;
b[ 1] = data02;
#else
data01 = *(ao1 + 0);
data02 = *(ao1 + 1);

b[ 0] = data01;
b[ 1] = data02;
if (X < posY) {
#endif
b += 2;
}
b[ 0] = *(ao1 + 0);
#ifdef UNIT
} else {
b[ 0] = ONE;
}
#endif
b[ 1] = *(ao1 + 1);
b += 2;
}
posY += 2;
}
Expand Down
45 changes: 19 additions & 26 deletions kernel/generic/trmm_utcopy_16.c
Original file line number Diff line number Diff line change
Expand Up @@ -1487,23 +1487,19 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
if (X < posY) {
a01 ++;
a02 ++;
b += 2;
} else
} else {
#ifdef UNIT
if (X > posY) {
#endif
b[ 0] = *(a01 + 0);
b[ 1] = *(a01 + 1);
// a01 += lda;
b += 2;
} else {
#ifdef UNIT
} else {
b[ 0] = ONE;
b[ 1] = *(a01 + 1);
#else
b[ 0] = *(a01 + 0);
b[ 1] = *(a01 + 1);
#endif
b += 2;
}
#endif
b[ 1] = *(a01 + 1);
}
b += 2;
}
posY += 2;
}
Expand All @@ -1522,25 +1518,22 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
if (i > 0) {
do {
if (X < posY) {
a01 += 1;
b ++;
} else
a01 ++;
} else {
#ifdef UNIT
if (X > posY) {
#endif
b[ 0] = *(a01 + 0);
a01 += lda;
b ++;
} else {
#ifdef UNIT
} else {
b[ 0] = ONE;
#else
b[ 0] = *(a01 + 0);
#endif
a01 += lda;
b ++;
}

X += 1;
i --;
#endif
a01 += lda;
}
b ++;
X ++;
i --;
} while (i > 0);
}
// posY += 1;
Expand Down
29 changes: 10 additions & 19 deletions kernel/generic/trmm_utcopy_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,27 +161,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
i = m;
if (m > 0) {
do {
if (X < posY) {
b += 1;
ao1 += 1;
} else
if (X > posY) {
data01 = *(ao1 + 0);
b[ 0] = data01;
b += 1;
ao1 += lda;
} else {
#ifdef UNIT
b[ 0] = ONE;
#else
data01 = *(ao1 + 0);
b[ 0] = data01;
if (X > posY) {
#endif
b += 1;
ao1 += lda;
}

X += 1;
b[ 0] = *(ao1 + 0);
#ifdef UNIT
} else {
b[ 0] = ONE;
}
#endif
b ++;
ao1 += lda;
X ++;
i --;
} while (i > 0);
}
Expand Down
25 changes: 10 additions & 15 deletions kernel/generic/trmm_utcopy_4.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,26 +443,21 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
do {

if (X < posY) {
b += 1;
ao1 += 1;
} else
} else {
#ifdef UNIT
if (X > posY) {
data01 = *(ao1 + 0);
b[ 0] = data01;
ao1 += lda;
b += 1;
} else {
#endif
b[ 0] = *(ao1 + 0);
#ifdef UNIT
} else {
b[ 0] = ONE;
#else
data01 = *(ao1 + 0);
b[ 0] = data01;
#endif
ao1 += lda;
b += 1;
}

X += 1;
#endif
ao1 += lda;
}
b ++;
X ++;
i --;
} while (i > 0);
}
Expand Down
2 changes: 2 additions & 0 deletions kernel/generic/trmmkernel_16x2.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ int CNAME(BLASLONG bm,BLASLONG bn,BLASLONG bk,FLOAT alpha,FLOAT* ba,FLOAT* bb,FL

#if !defined(LEFT)
off = -offset;
#else
off = 0;
#endif


Expand Down
2 changes: 2 additions & 0 deletions kernel/generic/trmmkernel_2x2.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ int CNAME(BLASLONG bm,BLASLONG bn,BLASLONG bk,FLOAT alpha,FLOAT* ba,FLOAT* bb,FL
BLASLONG off, temp;
#if defined(TRMMKERNEL) && !defined(LEFT)
off = -offset;
#else
off = 0;
#endif
for (j=0; j<bn/2; j+=1)
{
Expand Down
2 changes: 2 additions & 0 deletions kernel/generic/trmmkernel_8x2.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ int CNAME(BLASLONG bm,BLASLONG bn,BLASLONG bk,FLOAT alpha,FLOAT* ba,FLOAT* bb,FL

#if !defined(LEFT)
off = -offset;
#else
off = 0;
#endif


Expand Down
18 changes: 9 additions & 9 deletions kernel/generic/zlaswp_ncopy_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,20 +204,20 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*(b4 + 0) = A7;
*(b4 + 1) = A8;
}
}
}

buffer += 8;
buffer += 8;

b1 = a + ip1;
b2 = a + ip2;
b1 = a + ip1;
b2 = a + ip2;

b3 = b1 + lda;
b4 = b2 + lda;
b3 = b1 + lda;
b4 = b2 + lda;

a1 += 4;
a3 += 4;
a1 += 4;
a3 += 4;

i --;
i --;
} while (i > 0);
}

Expand Down
6 changes: 4 additions & 2 deletions kernel/generic/zlaswp_ncopy_4.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*(b4 + 0) = A7;
*(b4 + 1) = A8;
}
} else
} else {
if (b1 == a2) {
if (b2 == a2) {
*(buffer + 0) = A3;
Expand Down Expand Up @@ -503,7 +503,7 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*(b1 + 1) = A2;
*(b3 + 0) = A5;
*(b3 + 1) = A6;
} else
} else {
if (b2 == b1) {
*(buffer + 0) = B1;
*(buffer + 1) = B2;
Expand Down Expand Up @@ -536,6 +536,8 @@ int CNAME(BLASLONG n, BLASLONG k1, BLASLONG k2, FLOAT *a, BLASLONG lda, blasint
*(b4 + 0) = A7;
*(b4 + 1) = A8;
}
}
}
}

buffer += 8;
Expand Down
Loading