X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched_t.h;h=ebba2d0c1c3f404b5e2b565e4b79a41e7ae4eb0a;hb=939bdc6650d16b1e3ef18de427052a12859d404c;hp=aeff538e356b2ab9302271544e782a974d0ff6c1;hpb=c5fdb122134b4f951df289c2688e2abe054fb555;p=libfirm

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index aeff538e3..ebba2d0c1 100644
--- a/ir/be/besched_t.h
+++ b/ir/be/besched_t.h
@@ -20,7 +20,7 @@
 /**
  * @file
  * @brief       Scheduling utilities for nodes in Blocks and Blocks.
- * @author      Sebastian Hack
+ * @author      Sebastian Hack, Matthias Braun
  * @version     $Id$
  */
 #ifndef FIRM_BE_BESCHED_T_H
@@ -36,36 +36,18 @@
 
 #include "beutil.h"
 #include "besched.h"
+#include "beinfo.h"
 
-typedef unsigned int sched_timestep_t;
-
-extern size_t sched_irn_data_offset;
-
-/**
- * The schedule structure which is present at each ir node.
- *
- * Currently, only basic blocks are scheduled. The list head of
- * every block schedule list is the Block list.
- */
-typedef struct _sched_info_t {
-	struct list_head list;         /**< The list head to list the nodes in a schedule. */
-	unsigned idx;                  /**< The node index of the nodes this schedule info belongs to. */
-	sched_timestep_t time_step;    /**< If a is after b in a schedule, its time step is larger than b's. */
-	unsigned scheduled : 1;        /**< 1, if the node is in the schedule of the block, 0 else. */
-} sched_info_t;
-
-#define _sched_entry(list_head)             (list_entry(list_head, sched_info_t, list))
-#define get_irn_sched_info(irn)             ((sched_info_t *) get_or_set_irn_phase_info(skip_Proj_const(irn), PHASE_BE_SCHED))
-#define get_sched_info_irn(irg, sched_info) get_idx_irn((irg), (sched_info)->idx)
+#define get_irn_sched_info(irn)             (&be_get_info(skip_Proj_const(irn))->sched_info)
 
 /**
  * Returns non-zero if schedule information is available
  * for a given graph.
  * @param irg  The graph.
  */
-static INLINE int _have_sched_info(const ir_graph *irg)
+static inline int _have_sched_info(const ir_graph *irg)
 {
-	return get_irg_phase(irg, PHASE_BE_SCHED) != NULL;
+	return be_info_initialized(irg);
 }
 
 /**
@@ -73,9 +55,9 @@ static INLINE int _have_sched_info(const ir_graph *irg)
  * @param irn The node.
  * @return 1, if the node is scheduled, 0 if not.
  */
-static INLINE int _sched_is_scheduled(const ir_node *irn)
+static inline int _sched_is_scheduled(const ir_node *irn)
 {
-	return get_irn_sched_info(irn)->scheduled;
+	return get_irn_sched_info(irn)->next != NULL;
 }
 
 /**
@@ -83,7 +65,7 @@ static INLINE int _sched_is_scheduled(const ir_node *irn)
  * @param irn The node.
  * @return The time step in the schedule.
  */
-static INLINE int _sched_get_time_step(const ir_node *irn)
+static inline int _sched_get_time_step(const ir_node *irn)
 {
 	assert(_sched_is_scheduled(irn));
 	return get_irn_sched_info(irn)->time_step;
@@ -95,7 +77,7 @@ static INLINE int _sched_get_time_step(const ir_node *irn)
  * @param irn The node to check for.
  * @return 1, if the node consumes/produces data, false if not.
  */
-static INLINE int to_appear_in_schedule(const ir_node *irn)
+static inline int to_appear_in_schedule(const ir_node *irn)
 {
 	switch(get_irn_opcode(irn)) {
 		case iro_Start:
@@ -114,12 +96,11 @@ static INLINE int to_appear_in_schedule(const ir_node *irn)
  * @param irn The ir node.
  * @return 1, if the node has a scheduling successor, 0 if not.
  */
-static INLINE int _sched_has_next(const ir_node *irn)
+static inline int _sched_has_next(const ir_node *irn)
 {
-	const ir_node *block = is_Block(irn) ? irn : get_nodes_block(irn);
-	const sched_info_t *info = get_irn_sched_info(irn);
-	const sched_info_t *block_info = get_irn_sched_info(block);
-	return info->list.next != &block_info->list;
+	const sched_info_t *info  = get_irn_sched_info(irn);
+	const ir_node      *block = is_Block(irn) ? irn : get_nodes_block(irn);
+	return info->next != block;
 }
 
 /**
@@ -127,12 +108,11 @@ static INLINE int _sched_has_next(const ir_node *irn)
  * @param irn The ir node.
  * @return 1, if the node has a scheduling predecessor, 0 if not.
  */
-static INLINE int _sched_has_prev(const ir_node *irn)
+static inline int _sched_has_prev(const ir_node *irn)
 {
-   	const ir_node *block = is_Block(irn) ? irn : get_nodes_block(irn);
-	const sched_info_t *info = get_irn_sched_info(irn);
-	const sched_info_t *block_info = get_irn_sched_info(block);
-	return info->list.prev != &block_info->list;
+	const sched_info_t *info  = get_irn_sched_info(irn);
+   	const ir_node      *block = is_Block(irn) ? irn : get_nodes_block(irn);
+	return info->prev != block;
 }
 
 /**
@@ -140,10 +120,10 @@ static INLINE int _sched_has_prev(const ir_node *irn)
  * @param irn The node.
  * @return The next ir node in the schedule or the block, if the node has no next node.
  */
-static INLINE ir_node *_sched_next(const ir_node *irn)
+static inline ir_node *_sched_next(const ir_node *irn)
 {
 	const sched_info_t *info = get_irn_sched_info(irn);
-	return get_sched_info_irn(get_irn_irg(irn), _sched_entry(info->list.next));
+	return info->next;
 }
 
 /**
@@ -152,10 +132,10 @@ static INLINE ir_node *_sched_next(const ir_node *irn)
  * @return The next ir node in the schedule or the block, if the node has no predecessor.
  * predecessor.
  */
-static INLINE ir_node *_sched_prev(const ir_node *irn)
+static inline ir_node *_sched_prev(const ir_node *irn)
 {
 	const sched_info_t *info = get_irn_sched_info(irn);
-	return get_sched_info_irn(get_irn_irg(irn), _sched_entry(info->list.prev));
+	return info->prev;
 }
 
 /**
@@ -164,7 +144,7 @@ static INLINE ir_node *_sched_prev(const ir_node *irn)
  * @return The first node in the schedule or the block itself
  *         if there is no node in the schedule.
  */
-static INLINE ir_node *_sched_first(const ir_node *block)
+static inline ir_node *_sched_first(const ir_node *block)
 {
 	assert(is_Block(block) && "Need a block here");
 	return _sched_next(block);
@@ -176,7 +156,7 @@ static INLINE ir_node *_sched_first(const ir_node *block)
  * @return The last ir node in a schedule, or the block itself
  *         if there is no node in the schedule.
  */
-static INLINE ir_node *_sched_last(const ir_node *block)
+static inline ir_node *_sched_last(const ir_node *block)
 {
 	assert(is_Block(block) && "Need a block here");
 	return _sched_prev(block);
@@ -188,20 +168,26 @@ static INLINE ir_node *_sched_last(const ir_node *block)
  */
 void sched_renumber(const ir_node *block);
 
-static INLINE void _sched_set_time_stamp(const ir_node *irn)
+static inline void _sched_set_time_stamp(const ir_node *irn)
 {
-	sched_info_t *inf = get_irn_sched_info(irn);
-	sched_timestep_t before_ts = _sched_entry(inf->list.prev)->time_step;
-	sched_timestep_t after_ts = _sched_entry(inf->list.next)->time_step;
+	sched_info_t       *info      = get_irn_sched_info(irn);
+	const sched_info_t *prev_info = get_irn_sched_info(info->prev);
+	const sched_info_t *next_info = get_irn_sched_info(info->next);
+	sched_timestep_t    before_ts = prev_info->time_step;
+	sched_timestep_t    after_ts  = next_info->time_step;
 
 	/*
 	 * If we are the last, we can give us a big time step,
 	 * else we have to compute our time step from our
 	 * neighbours.
 	 */
-	if(before_ts >= after_ts)
-		inf->time_step = before_ts + SCHED_INITIAL_GRANULARITY;
-	else {
+	if(before_ts >= after_ts) {
+		info->time_step = before_ts + SCHED_INITIAL_GRANULARITY;
+		/* overflow? */
+		if (info->time_step <= before_ts) {
+			sched_renumber(get_nodes_block(irn));
+		}
+	} else {
 		sched_timestep_t ts = (before_ts + after_ts) / 2;
 
 		/*
@@ -211,7 +197,7 @@ static INLINE void _sched_set_time_stamp(const ir_node *irn)
 		if(ts == before_ts || ts == after_ts)
 			sched_renumber(get_nodes_block(irn));
 		else
-			inf->time_step = ts;
+			info->time_step = ts;
 	}
 }
 
@@ -221,15 +207,23 @@ static INLINE void _sched_set_time_stamp(const ir_node *irn)
  * @param irn The node to add.
  * @return The given node.
  */
-static INLINE void _sched_add_before(const ir_node *before, const ir_node *irn)
+static inline void _sched_add_before(ir_node *before, ir_node *irn)
 {
-	sched_info_t *info = get_irn_sched_info(irn);
+	sched_info_t *info      = get_irn_sched_info(irn);
+	ir_node      *next      = before;
+	sched_info_t *next_info = get_irn_sched_info(next);
+	ir_node      *prev      = next_info->prev;
+	sched_info_t *prev_info = get_irn_sched_info(prev);
 	assert(_sched_is_scheduled(before));
 	assert(!_sched_is_scheduled(irn));
+	assert(!is_Proj(before));
 	assert(!is_Proj(irn));
-	list_add_tail(&info->list, &get_irn_sched_info(before)->list);
+
+	info->prev = prev;
+	info->next = next;
+	prev_info->next = irn;
+	next_info->prev = irn;
 	_sched_set_time_stamp(irn);
-	info->scheduled = 1;
 }
 
 /**
@@ -238,41 +232,57 @@ static INLINE void _sched_add_before(const ir_node *before, const ir_node *irn)
  * @param irn The node to add.
  * @return The given node.
  */
-static INLINE void _sched_add_after(const ir_node *after, const ir_node *irn)
+static inline void _sched_add_after(ir_node *after, ir_node *irn)
 {
-	sched_info_t *info = get_irn_sched_info(irn);
+	sched_info_t *info      = get_irn_sched_info(irn);
+	ir_node      *prev      = after;
+	sched_info_t *prev_info = get_irn_sched_info(prev);
+	ir_node      *next      = prev_info->next;
+	sched_info_t *next_info = get_irn_sched_info(next);
 	assert(_sched_is_scheduled(after));
 	assert(!_sched_is_scheduled(irn));
+	assert(!is_Proj(after));
 	assert(!is_Proj(irn));
-	list_add(&info->list, &get_irn_sched_info(after)->list);
+
+	info->prev = prev;
+	info->next = next;
+	prev_info->next = irn;
+	next_info->prev = irn;
 	_sched_set_time_stamp(irn);
-	info->scheduled = 1;
 }
 
-static INLINE void _sched_init_block(const ir_node *block)
+static inline void _sched_init_block(ir_node *block)
 {
 	sched_info_t *info = get_irn_sched_info(block);
-	assert(info->scheduled == 0 && info->time_step == 0);
-	INIT_LIST_HEAD(&info->list);
-	info->scheduled = 1;
+	assert(info->next == NULL && info->time_step == 0);
+	info->next = block;
+	info->prev = block;
 }
 
-static INLINE void _sched_reset(const ir_node *node)
+static inline void _sched_reset(ir_node *node)
 {
 	sched_info_t *info = get_irn_sched_info(node);
-	info->scheduled = 0;
+	info->next = NULL;
+	info->prev = NULL;
 }
 
 /**
  * Remove a node from the scheduled.
  * @param irn The node.
  */
-static INLINE void _sched_remove(const ir_node *irn)
+static inline void _sched_remove(ir_node *irn)
 {
-	sched_info_t *info = get_irn_sched_info(irn);
-	list_del(&info->list);
-	INIT_LIST_HEAD(&info->list);
-	info->scheduled = 0;
+	sched_info_t *info      = get_irn_sched_info(irn);
+	ir_node      *prev      = info->prev;
+	ir_node      *next      = info->next;
+	sched_info_t *prev_info = get_irn_sched_info(prev);
+	sched_info_t *next_info = get_irn_sched_info(next);
+	assert(_sched_is_scheduled(irn));
+
+	prev_info->next = next;
+	next_info->prev = prev;
+	info->next      = NULL;
+	info->prev      = NULL;
 }
 
 /**
@@ -282,7 +292,7 @@ static INLINE void _sched_remove(const ir_node *irn)
  * @return A number smaller, equals to or larger than 0, if a is
  *         before, the same, or after b in the schedule.
  */
-static INLINE int _sched_cmp(const ir_node *a, const ir_node *b)
+static inline int _sched_cmp(const ir_node *a, const ir_node *b)
 {
 	assert(_sched_is_scheduled(a) && _sched_is_scheduled(b));
 	assert(get_nodes_block(a) == get_nodes_block(b));
@@ -297,11 +307,11 @@ static INLINE int _sched_cmp(const ir_node *a, const ir_node *b)
  * @return     1, if n1 is in front of n2 in the schedule, 0 else.
  * @note       Both nodes must be in the same block.
  */
-static INLINE int _sched_comes_after(const ir_node *n1, const ir_node *n2)
+static inline int _sched_comes_after(const ir_node *n1, const ir_node *n2)
 {
 	assert(_sched_is_scheduled(n1));
 	assert(_sched_is_scheduled(n2));
-	assert(get_nodes_block(n1) == get_nodes_block(n2));
+	assert((is_Block(n1) ? n1 : get_nodes_block(n1)) == (is_Block(n2) ? n2 : get_nodes_block(n2)));
 	return _sched_get_time_step(n1) < _sched_get_time_step(n2);
 }
 
@@ -317,8 +327,7 @@ typedef int (sched_predicator_t)(const ir_node *irn, void *data);
  * Predicate for sched_skip(), returns non-zero if irn is a control flow changing node.
  *
  * @param irn   the node to evaluate
- * @param data  an arch_env_t * used to determine if irn is a cf
- *              node for the given architecture
+ * @param data  unused
  */
 int sched_skip_cf_predicator(const ir_node *irn, void *data);