Commit 98975653 by Daniel Berlin Committed by Daniel Berlin

lambda.h: Add matrix type, and prototypes for remainder of matrix and vector functions.

2004-08-10  Daniel Berlin <dberlin@dberlin.org>

	* lambda.h: Add matrix type, and prototypes for remainder of
	matrix and vector functions.
	(lambda_vector_mult_const): New function.
	(lambda_vector_negate): Ditto.
	(lambda_vector_add): Ditto.
	(lambda_vector_add_mc): Ditto.
	(lambda_vector_copy): Ditto.
	(lambda_vector_zerop): Ditto.
	(lambda_vector_equal): Ditto.
	(lambda_vector_min_nz): Ditto.
	(lambda_vector_first_nz): Ditto.
	(lambda_vector_matrix_mult): Ditto.
	* lambda-mat.c: New file.
	* Makefile.in (lambda-mat.o): New.

From-SVN: r85767
parent 68b9f53b
2004-08-10 Daniel Berlin <dberlin@dberlin.org>
* lambda.h: Add matrix type, and prototypes for remainder of
matrix and vector functions.
(lambda_vector_mult_const): New function.
(lambda_vector_negate): Ditto.
(lambda_vector_add): Ditto.
(lambda_vector_add_mc): Ditto.
(lambda_vector_copy): Ditto.
(lambda_vector_zerop): Ditto.
(lambda_vector_equal): Ditto.
(lambda_vector_min_nz): Ditto.
(lambda_vector_first_nz): Ditto.
(lambda_vector_matrix_mult): Ditto.
* lambda-mat.c: New file.
* Makefile.in (lambda-mat.o): New.
2004-08-10 Andrew MacLeod <amacleod@redhat.com> 2004-08-10 Andrew MacLeod <amacleod@redhat.com>
* tree-cfg.c (bsi_insert_before, bsi_insert_after): Call modify_stmt * tree-cfg.c (bsi_insert_before, bsi_insert_after): Call modify_stmt
......
...@@ -140,7 +140,7 @@ XCFLAGS = ...@@ -140,7 +140,7 @@ XCFLAGS =
TCFLAGS = TCFLAGS =
CFLAGS = -g CFLAGS = -g
STAGE1_CFLAGS = -g @stage1_cflags@ STAGE1_CFLAGS = -g @stage1_cflags@
BOOT_CFLAGS = -g -O2 BOOT_CFLAGS = -g -O2 -dU
# Flags to determine code coverage. When coverage is disabled, this will # Flags to determine code coverage. When coverage is disabled, this will
# contain the optimization flags, as you normally want code coverage # contain the optimization flags, as you normally want code coverage
...@@ -922,7 +922,7 @@ OBJS-common = \ ...@@ -922,7 +922,7 @@ OBJS-common = \
targhooks.o timevar.o toplev.o tracer.o tree.o tree-dump.o unroll.o \ targhooks.o timevar.o toplev.o tracer.o tree.o tree-dump.o unroll.o \
varasm.o varray.o vec.o version.o vmsdbgout.o xcoffout.o alloc-pool.o \ varasm.o varray.o vec.o version.o vmsdbgout.o xcoffout.o alloc-pool.o \
et-forest.o cfghooks.o bt-load.o pretty-print.o $(GGC) web.o passes.o \ et-forest.o cfghooks.o bt-load.o pretty-print.o $(GGC) web.o passes.o \
rtl-profile.o tree-profile.o rtlhooks.o cfgexpand.o rtl-profile.o tree-profile.o rtlhooks.o cfgexpand.o lambda-mat.o
OBJS-md = $(out_object_file) OBJS-md = $(out_object_file)
OBJS-archive = $(EXTRA_OBJS) $(host_hook_obj) tree-inline.o \ OBJS-archive = $(EXTRA_OBJS) $(host_hook_obj) tree-inline.o \
...@@ -2127,6 +2127,7 @@ ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ ...@@ -2127,6 +2127,7 @@ ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
$(REGS_H) toplev.h $(FLAGS_H) insn-config.h function.h $(RECOG_H) $(TARGET_H) \ $(REGS_H) toplev.h $(FLAGS_H) insn-config.h function.h $(RECOG_H) $(TARGET_H) \
$(BASIC_BLOCK_H) $(EXPR_H) output.h except.h $(TM_P_H) real.h $(OPTABS_H) \ $(BASIC_BLOCK_H) $(EXPR_H) output.h except.h $(TM_P_H) real.h $(OPTABS_H) \
$(CFGLOOP_H) $(CFGLOOP_H)
lambda-mat.o : lambda-mat.c lambda.h $(GGC_H) $(SYSTEM_H) $(CONFIG_H) $(TM_H)
params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) toplev.h params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) toplev.h
hooks.o: hooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(HOOKS_H) hooks.o: hooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(HOOKS_H)
pretty-print.o: $(CONFIG_H) $(SYSTEM_H) pretty-print.c $(PRETTY_PRINT_H) pretty-print.o: $(CONFIG_H) $(SYSTEM_H) pretty-print.c $(PRETTY_PRINT_H)
......
/* Lambda matrix interface. /* Lambda matrix and vector interface.
Copyright (C) 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2003, 2004 Free Software Foundation, Inc.
Contributed by Daniel Berlin <dberlin@dberlin.org> Contributed by Daniel Berlin <dberlin@dberlin.org>
...@@ -18,11 +18,65 @@ You should have received a copy of the GNU General Public License ...@@ -18,11 +18,65 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to the Free along with GCC; see the file COPYING. If not, write to the Free
Software Foundation, 59 Temple Place - Suite 330, Boston, MA Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */ 02111-1307, USA. */
#ifndef LAMBDA_H #ifndef LAMBDA_H
#define LAMBDA_H #define LAMBDA_H
/* An integer vector. A vector formally consists of an element of a vector
space. A vector space is a set that is closed under vector addition
and scalar multiplication. In this vector space, an element is a list of
integers. */
typedef int *lambda_vector; typedef int *lambda_vector;
/* An integer matrix. A matrix consists of m vectors of length n (IE
all vectors are the same length). */
typedef lambda_vector *lambda_matrix;
lambda_matrix lambda_matrix_new (int, int);
void lambda_matrix_id (lambda_matrix, int);
void lambda_matrix_copy (lambda_matrix, lambda_matrix, int, int);
void lambda_matrix_negate (lambda_matrix, lambda_matrix, int, int);
void lambda_matrix_transpose (lambda_matrix, lambda_matrix, int, int);
void lambda_matrix_add (lambda_matrix, lambda_matrix, lambda_matrix, int,
int);
void lambda_matrix_add_mc (lambda_matrix, int, lambda_matrix, int,
lambda_matrix, int, int);
void lambda_matrix_mult (lambda_matrix, lambda_matrix, lambda_matrix,
int, int, int);
void lambda_matrix_delete_rows (lambda_matrix, int, int, int);
void lambda_matrix_row_exchange (lambda_matrix, int, int);
void lambda_matrix_row_add (lambda_matrix, int, int, int, int);
void lambda_matrix_row_negate (lambda_matrix mat, int, int);
void lambda_matrix_row_mc (lambda_matrix, int, int, int);
void lambda_matrix_col_exchange (lambda_matrix, int, int, int);
void lambda_matrix_col_add (lambda_matrix, int, int, int, int);
void lambda_matrix_col_negate (lambda_matrix, int, int);
void lambda_matrix_col_mc (lambda_matrix, int, int, int);
int lambda_matrix_inverse (lambda_matrix, lambda_matrix, int);
void lambda_matrix_hermite (lambda_matrix, int, lambda_matrix, lambda_matrix);
void lambda_matrix_left_hermite (lambda_matrix, int, int, lambda_matrix, lambda_matrix);
void lambda_matrix_right_hermite (lambda_matrix, int, int, lambda_matrix, lambda_matrix);
int lambda_matrix_first_nz_vec (lambda_matrix, int, int, int);
void lambda_matrix_project_to_null (lambda_matrix, int, int, int,
lambda_vector);
void print_lambda_matrix (FILE *, lambda_matrix, int, int);
void lambda_matrix_vector_mult (lambda_matrix, int, int, lambda_vector,
lambda_vector);
static inline void lambda_vector_negate (lambda_vector, lambda_vector, int);
static inline void lambda_vector_mult_const (lambda_vector, lambda_vector, int, int);
static inline void lambda_vector_add (lambda_vector, lambda_vector,
lambda_vector, int);
static inline void lambda_vector_add_mc (lambda_vector, int, lambda_vector, int,
lambda_vector, int);
static inline void lambda_vector_copy (lambda_vector, lambda_vector, int);
static inline bool lambda_vector_zerop (lambda_vector, int);
static inline void lambda_vector_clear (lambda_vector, int);
static inline bool lambda_vector_equal (lambda_vector, lambda_vector, int);
static inline int lambda_vector_min_nz (lambda_vector, int, int);
static inline int lambda_vector_first_nz (lambda_vector, int, int);
static inline void print_lambda_vector (FILE *, lambda_vector, int);
/* Allocate a new vector of given SIZE. */ /* Allocate a new vector of given SIZE. */
...@@ -32,14 +86,149 @@ lambda_vector_new (int size) ...@@ -32,14 +86,149 @@ lambda_vector_new (int size)
return ggc_alloc_cleared (size * sizeof(int)); return ggc_alloc_cleared (size * sizeof(int));
} }
/* Multiply vector VEC1 of length SIZE by a constant CONST1,
and store the result in VEC2. */
static inline void
lambda_vector_mult_const (lambda_vector vec1, lambda_vector vec2,
int size, int const1)
{
int i;
if (const1 == 0)
lambda_vector_clear (vec2, size);
else
for (i = 0; i < size; i++)
vec2[i] = const1 * vec1[i];
}
/* Negate vector VEC1 with length SIZE and store it in VEC2. */
static inline void
lambda_vector_negate (lambda_vector vec1, lambda_vector vec2,
int size)
{
lambda_vector_mult_const (vec1, vec2, size, -1);
}
/* VEC3 = VEC1+VEC2, where all three the vectors are of length SIZE. */
static inline void
lambda_vector_add (lambda_vector vec1, lambda_vector vec2,
lambda_vector vec3, int size)
{
int i;
for (i = 0; i < size; i++)
vec3[i] = vec1[i] + vec2[i];
}
/* VEC3 = CONSTANT1*VEC1 + CONSTANT2*VEC2. All vectors have length SIZE. */
static inline void
lambda_vector_add_mc (lambda_vector vec1, int const1,
lambda_vector vec2, int const2,
lambda_vector vec3, int size)
{
int i;
for (i = 0; i < size; i++)
vec3[i] = const1 * vec1[i] + const2 * vec2[i];
}
/* Copy the elements of vector VEC1 with length SIZE to VEC2. */
static inline void
lambda_vector_copy (lambda_vector vec1, lambda_vector vec2,
int size)
{
memcpy (vec2, vec1, size * sizeof (*vec1));
}
/* Return true if vector VEC1 of length SIZE is the zero vector. */
static inline bool
lambda_vector_zerop (lambda_vector vec1, int size)
{
int i;
for (i = 0; i < size; i++)
if (vec1[i] != 0)
return false;
return true;
}
/* Clear out vector VEC1 of length SIZE. */ /* Clear out vector VEC1 of length SIZE. */
static inline void static inline void
lambda_vector_clear (lambda_vector vec1, int size) lambda_vector_clear (lambda_vector vec1, int size)
{ {
memset (vec1, 0, size * sizeof (int)); memset (vec1, 0, size * sizeof (*vec1));
} }
/* Return true if two vectors are equal. */
static inline bool
lambda_vector_equal (lambda_vector vec1, lambda_vector vec2, int size)
{
int i;
for (i = 0; i < size; i++)
if (vec1[i] != vec2[i])
return false;
return true;
}
/* Return the minimum non-zero element in vector VEC1 between START and N.
We must have START <= N. */
static inline int
lambda_vector_min_nz (lambda_vector vec1, int n, int start)
{
int j;
int min = -1;
#ifdef ENABLE_CHECKING
if (start > n)
abort ();
#endif
for (j = start; j < n; j++)
{
if (vec1[j])
if (min < 0 || vec1[j] < vec1[min])
min = j;
}
if (min < 0)
abort ();
return min;
}
/* Return the first nonzero element of vector VEC1 between START and N.
We must have START <= N. Returns N if VEC1 is the zero vector. */
static inline int
lambda_vector_first_nz (lambda_vector vec1, int n, int start)
{
int j = start;
while (j < n && vec1[j] == 0)
j++;
return j;
}
/* Multiply a vector by a matrix. */
static inline void
lambda_vector_matrix_mult (lambda_vector vect, int m, lambda_matrix mat,
int n, lambda_vector dest)
{
int i, j;
lambda_vector_clear (dest, n);
for (i = 0; i < n; i++)
for (j = 0; j < m; j++)
dest[i] += mat[j][i] * vect[j];
}
/* Print out a vector VEC of length N to OUTFILE. */ /* Print out a vector VEC of length N to OUTFILE. */
static inline void static inline void
...@@ -51,7 +240,5 @@ print_lambda_vector (FILE * outfile, lambda_vector vector, int n) ...@@ -51,7 +240,5 @@ print_lambda_vector (FILE * outfile, lambda_vector vector, int n)
fprintf (outfile, "%3d ", vector[i]); fprintf (outfile, "%3d ", vector[i]);
fprintf (outfile, "\n"); fprintf (outfile, "\n");
} }
#endif /* LAMBDA_H */ #endif /* LAMBDA_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment