Fix pheft and modular-* respecting workerids

This completes ed88399 ("Honor workerids in all versions of
worker_can_execute_task") that missed the
starpu_combined_worker_can_execute_task case

src/core/workers.c

@@ -695,13 +695,10 @@ int starpu_combined_worker_can_execute_task(unsigned workerid, struct starpu_tas
 	unsigned nworkers = _starpu_config.topology.nworkers;
 
 
-	if (!_starpu_enforce_locality(workerid, task))
-		return 0;
-
 	/* Is this a parallel worker ? */
 	if (workerid < nworkers)
 	{
-		if (!_starpu_config.workers[workerid].enable_knob)
+		if (!_starpu_can_execute_task_any_impl(workerid, task))
 			return 0;
 
 		return !!((task->where & _starpu_config.workers[workerid].worker_mask) &&
@@ -710,6 +707,9 @@ int starpu_combined_worker_can_execute_task(unsigned workerid, struct starpu_tas
 	}
 	else
 	{
+		if (!_starpu_enforce_locality(workerid, task))
+			return 0;
+
 		if (cl->type == STARPU_SPMD
 #ifdef STARPU_HAVE_HWLOC
 				|| cl->type == STARPU_FORKJOIN

tests/sched_policies/workerids.c

@@ -112,13 +112,10 @@ int main(void)
 	{
 		int ret;
 
-		if (strncmp((*policy)->policy_name, "modular-", 8) == 0
-		 ||  strcmp((*policy)->policy_name, "pheft") == 0
-		 ||  strcmp((*policy)->policy_name, "heteroprio") == 0
-		 ||  strcmp((*policy)->policy_name, "lws") == 0
-		 ||  strcmp((*policy)->policy_name, "ws") == 0)
+		if (strcmp((*policy)->policy_name, "lws") == 0
+		 || strcmp((*policy)->policy_name, "ws") == 0)
 #ifdef STARPU_DEVEL
-#warning FIXME for modular-*, pheft and heteroprio
+#warning FIXME performance for ws
 #endif
 			continue;