[polly] d024025 - [Polly] Silence mixed signed/unsigned comparison warnings. NFC.

[Michael Kruse via llvm-commits]

Author: Michael Kruse
Date: 2020-02-10T19:03:08-06:00
New Revision: d0240257cdd97aced27dc48d7412aca83f73761f

URL: https://github.com/llvm/llvm-project/commit/d0240257cdd97aced27dc48d7412aca83f73761f
DIFF: https://github.com/llvm/llvm-project/commit/d0240257cdd97aced27dc48d7412aca83f73761f.diff

LOG: [Polly] Silence mixed signed/unsigned comparison warnings. NFC.

ISL changed some return types from unsigned to
isl_size (typedef of int), which results in such warnings.

Added: 
    

Modified: 
    polly/lib/Analysis/ScopBuilder.cpp
    polly/lib/Exchange/JSONExporter.cpp
    polly/lib/Transform/ScheduleOptimizer.cpp

Removed: 
    


################################################################################
diff  --git a/polly/lib/Analysis/ScopBuilder.cpp b/polly/lib/Analysis/ScopBuilder.cpp
index e071646524e7..85eef9ba1764 100644
--- a/polly/lib/Analysis/ScopBuilder.cpp
+++ b/polly/lib/Analysis/ScopBuilder.cpp
@@ -1579,7 +1579,7 @@ void ScopBuilder::addUserAssumptions(
 
     // Project out newly introduced parameters as they are not otherwise useful.
     if (!NewParams.empty()) {
-      for (unsigned u = 0; u < isl_set_n_param(AssumptionCtx); u++) {
+      for (isl_size u = 0; u < isl_set_n_param(AssumptionCtx); u++) {
         auto *Id = isl_set_get_dim_id(AssumptionCtx, isl_dim_param, u);
         auto *Param = static_cast<const SCEV *>(isl_id_get_user(Id));
         isl_id_free(Id);
@@ -3285,7 +3285,8 @@ static bool buildMinMaxAccess(isl::set Set,
   //           11          |     6.78
   //           12          |    30.38
   //
-  if (isl_set_n_param(Set.get()) > RunTimeChecksMaxParameters) {
+  if (isl_set_n_param(Set.get()) >
+      static_cast<isl_size>(RunTimeChecksMaxParameters)) {
     unsigned InvolvedParams = 0;
     for (unsigned u = 0, e = isl_set_n_param(Set.get()); u < e; u++)
       if (Set.involves_dims(isl::dim::param, u, 1))

diff  --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index 707260bb29fa..3f54bce141d7 100644
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -305,7 +305,7 @@ static bool importSchedule(Scop &S, const json::Object &JScop,
     // that stores the reference to the ScopStmt this schedule belongs to.
     Map = isl_map_set_tuple_id(Map, isl_dim_in,
                                isl_space_get_tuple_id(Space, isl_dim_set));
-    for (unsigned i = 0; i < isl_space_dim(Space, isl_dim_param); i++) {
+    for (isl_size i = 0; i < isl_space_dim(Space, isl_dim_param); i++) {
       isl_id *Id = isl_space_get_dim_id(Space, isl_dim_param, i);
       Map = isl_map_set_dim_id(Map, isl_dim_param, i, Id);
     }
@@ -479,7 +479,7 @@ importAccesses(Scop &S, const json::Object &JScop, const DataLayout &DL,
       // We need to copy the isl_ids for the parameter dimensions to the new
       // map. Without doing this the current map would have 
diff erent
       // ids then the new one, even though both are named identically.
-      for (unsigned i = 0; i < isl_map_dim(CurrentAccessMap, isl_dim_param);
+      for (isl_size i = 0; i < isl_map_dim(CurrentAccessMap, isl_dim_param);
            i++) {
         isl_id *Id = isl_map_get_dim_id(CurrentAccessMap, isl_dim_param, i);
         NewAccessMap = isl_map_set_dim_id(NewAccessMap, isl_dim_param, i, Id);

diff  --git a/polly/lib/Transform/ScheduleOptimizer.cpp b/polly/lib/Transform/ScheduleOptimizer.cpp
index 1566a8abab3c..c54bc08445b7 100644
--- a/polly/lib/Transform/ScheduleOptimizer.cpp
+++ b/polly/lib/Transform/ScheduleOptimizer.cpp
@@ -1260,7 +1260,7 @@ getBandNodeWithOriginDimOrder(isl::schedule_node Node) {
   auto Domain = Node.get_universe_domain();
   assert(isl_union_set_n_set(Domain.get()) == 1);
   if (Node.get_schedule_depth() != 0 ||
-      (isl::set(Domain).dim(isl::dim::set) !=
+      (static_cast<isl_size>(isl::set(Domain).dim(isl::dim::set)) !=
        isl_schedule_node_band_n_member(Node.get())))
     return Node;
   Node = isl::manage(isl_schedule_node_delete(Node.copy()));