drop spurious files

src/sched_policies/component_heteroprio.c

@@ -1,166 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2013,2017,2018                           Inria
- * Copyright (C) 2014-2018                                CNRS
- * Copyright (C) 2013-2019                                Université de Bordeaux
- * Copyright (C) 2013                                     Simon Archipoff
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-/* Heteroprio, which sorts tasks by acceleration factor into buckets, and makes
- * GPUs take accelerated tasks first and CPUs take non-accelerated tasks first */
-
-#include <starpu_sched_component.h>
-#include "prio_deque.h"
-#include <starpu_perfmodel.h>
-#include <float.h>
-#include <core/sched_policy.h>
-#include <core/task.h>
-
-struct _starpu_heteroprio_data
-{
-	struct _starpu_prio_deque prio;
-	starpu_pthread_mutex_t mutex;
-};
-
-static int heteroprio_progress_one(struct starpu_sched_component *component)
-{
-	struct _starpu_heteroprio_data * data = component->data;
-	starpu_pthread_mutex_t * mutex = &data->mutex;
-	struct _starpu_prio_deque * prio = &data->prio;
-	struct starpu_task *task;
-	int ret;
-
-	STARPU_COMPONENT_MUTEX_LOCK(mutex);
-	task = _starpu_prio_deque_pop_task(prio);
-	STARPU_COMPONENT_MUTEX_UNLOCK(mutex);
-
-	if (!task)
-	{
-		return 1;
-	}
-
-	/* FIXME: should rather just loop over children before looping over its workers */
-	int workerid;
-	for(workerid = starpu_bitmap_first(component->workers_in_ctx);
-	    workerid != -1;
-	    workerid = starpu_bitmap_next(component->workers_in_ctx, workerid))
-	{
-		int nimpl;
-		for(nimpl = 0; nimpl < STARPU_MAXIMPLEMENTATIONS; nimpl++)
-		{
-			/* FIXME: use starpu_worker_can_execute_task_first_impl instead */
-			if(starpu_worker_can_execute_task(workerid,task,nimpl)
-			   || starpu_combined_worker_can_execute_task(workerid, task, nimpl))
-			{
-				unsigned i;
-				for (i = 0; i < component->nchildren; i++)
-				{
-					int idworker;
-					for(idworker = starpu_bitmap_first(component->children[i]->workers);
-						idworker != -1;
-						idworker = starpu_bitmap_next(component->children[i]->workers, idworker))
-					{
-						if (idworker == workerid)
-						{
-							STARPU_ASSERT(!starpu_sched_component_is_worker(component->children[i]));
-							ret = starpu_sched_component_push_task(component,component->children[i],task);
-							if (!ret)
-								return 0;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/* Could not push to child actually, push that one back too */
-	STARPU_COMPONENT_MUTEX_LOCK(mutex);
-	_starpu_prio_deque_push_front_task(prio, task);
-	STARPU_COMPONENT_MUTEX_UNLOCK(mutex);
-	return 1;
-}
-
-/* Try to push some tasks below */
-static void heteroprio_progress(struct starpu_sched_component *component)
-{
-	STARPU_ASSERT(component && starpu_sched_component_is_heteroprio(component));
-	while (!heteroprio_progress_one(component))
-		;
-}
-
-static int heteroprio_push_task(struct starpu_sched_component * component, struct starpu_task * task)
-{
-	STARPU_ASSERT(component && task && starpu_sched_component_is_heteroprio(component));
-	struct _starpu_heteroprio_data * data = component->data;
-	struct _starpu_prio_deque * prio = &data->prio;
-	starpu_pthread_mutex_t * mutex = &data->mutex;
-
-	STARPU_COMPONENT_MUTEX_LOCK(mutex);
-	_starpu_prio_deque_push_back_task(prio,task);
-	STARPU_COMPONENT_MUTEX_UNLOCK(mutex);
-
-	heteroprio_progress(component);
-
-	return 0;
-}
-
-static int heteroprio_can_push(struct starpu_sched_component *component, struct starpu_sched_component * to STARPU_ATTRIBUTE_UNUSED)
-{
-	heteroprio_progress(component);
-	int ret = 0;
-	unsigned j;
-	for(j=0; j < component->nparents; j++)
-	{
-		if(component->parents[j] == NULL)
-			continue;
-		else
-		{
-			ret = component->parents[j]->can_push(component->parents[j], component);
-			if(ret)
-				break;
-		}
-	}
-	return ret;
-}
-
-static void heteroprio_component_deinit_data(struct starpu_sched_component * component)
-{
-	STARPU_ASSERT(starpu_sched_component_is_heteroprio(component));
-	struct _starpu_heteroprio_data * d = component->data;
-	_starpu_prio_deque_destroy(&d->prio);
-	free(d);
-}
-
-int starpu_sched_component_is_heteroprio(struct starpu_sched_component * component)
-{
-	return component->push_task == heteroprio_push_task;
-}
-
-struct starpu_sched_component * starpu_sched_component_heteroprio_create(struct starpu_sched_tree *tree, void *arg)
-{
-	(void)arg;
-	struct starpu_sched_component * component = starpu_sched_component_create(tree, "heteroprio");
-	struct _starpu_heteroprio_data *data;
-	_STARPU_MALLOC(data, sizeof(*data));
-
-	_starpu_prio_deque_init(&data->prio);
-	STARPU_PTHREAD_MUTEX_INIT(&data->mutex,NULL);
-	component->data = data;
-
-	component->push_task = heteroprio_push_task;
-	component->can_push = heteroprio_can_push;
-	component->deinit_data = heteroprio_component_deinit_data;
-
-	return component;
-}

src/sched_policies/modular_heteroprio.c

@@ -1,54 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2013-2015,2017                           Inria
- * Copyright (C) 2014,2015,2017                           CNRS
- * Copyright (C) 2013-2015,2017,2018-2019                 Université de Bordeaux
- * Copyright (C) 2013                                     Simon Archipoff
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#include <starpu_sched_component.h>
-#include <starpu_scheduler.h>
-#include <float.h>
-#include <limits.h>
-
-static void initialize_heteroprio_center_policy(unsigned sched_ctx_id)
-{
-	starpu_sched_component_initialize_simple_scheduler((starpu_sched_component_create_t) starpu_sched_component_heteroprio_create, NULL,
-			STARPU_SCHED_SIMPLE_DECIDE_WORKERS |
-			STARPU_SCHED_SIMPLE_FIFOS_BELOW |
-			STARPU_SCHED_SIMPLE_FIFOS_BELOW_PRIO |
-			STARPU_SCHED_SIMPLE_IMPL, sched_ctx_id);
-}
-
-static void deinitialize_heteroprio_center_policy(unsigned sched_ctx_id)
-{
-	struct starpu_sched_tree *t = (struct starpu_sched_tree*)starpu_sched_ctx_get_policy_data(sched_ctx_id);
-	starpu_sched_tree_destroy(t);
-}
-
-struct starpu_sched_policy _starpu_sched_modular_heteroprio_policy =
-{
-	.init_sched = initialize_heteroprio_center_policy,
-	.deinit_sched = deinitialize_heteroprio_center_policy,
-	.add_workers = starpu_sched_tree_add_workers,
-	.remove_workers = starpu_sched_tree_remove_workers,
-	.push_task = starpu_sched_tree_push_task,
-	.pop_task = starpu_sched_tree_pop_task,
-	.pre_exec_hook = starpu_sched_component_worker_pre_exec_hook,
-	.post_exec_hook = starpu_sched_component_worker_post_exec_hook,
-	.pop_every_task = NULL,
-	.policy_name = "modular-heteroprio",
-	.policy_description = "heteroprio modular policy",
-	.worker_type = STARPU_WORKER_LIST,
-};