gitlab-ci: Add ppc64el and s390x cross-build jobs

[mesa.git] / src / compiler / nir / nir_lower_constant_initializers.c

diff --git a/src/compiler/nir/nir_lower_constant_initializers.c b/src/compiler/nir/nir_lower_constant_initializers.c
index 4e9cea46157736ff3c7c6c87ce8b7a0edec7329b..d373c2336d2b265ab64a3029a2f6c2206f75191d 100644 (file)
--- a/src/compiler/nir/nir_lower_constant_initializers.c
+++ b/src/compiler/nir/nir_lower_constant_initializers.c
@@ -32,33 +32,22 @@ build_constant_load(nir_builder *b, nir_deref_instr *deref, nir_constant *c)
          nir_load_const_instr_create(b->shader,
                                      glsl_get_vector_elements(deref->type),
                                      glsl_get_bit_size(deref->type));
-      load->value = c->values[0];
+      memcpy(load->value, c->values, sizeof(*load->value) * load->def.num_components);
       nir_builder_instr_insert(b, &load->instr);
       nir_store_deref(b, deref, &load->def, ~0);
-   } else if (glsl_type_is_matrix(deref->type)) {
-      unsigned cols = glsl_get_matrix_columns(deref->type);
-      unsigned rows = glsl_get_vector_elements(deref->type);
-      unsigned bit_size = glsl_get_bit_size(deref->type);
-      for (unsigned i = 0; i < cols; i++) {
-         nir_load_const_instr *load =
-            nir_load_const_instr_create(b->shader, rows, bit_size);
-         load->value = c->values[i];
-         nir_builder_instr_insert(b, &load->instr);
-         nir_store_deref(b, nir_build_deref_array(b, deref, nir_imm_int(b, i)),
-                         &load->def, ~0);
-      }
-   } else if (glsl_type_is_struct(deref->type)) {
+   } else if (glsl_type_is_struct_or_ifc(deref->type)) {
       unsigned len = glsl_get_length(deref->type);
       for (unsigned i = 0; i < len; i++) {
          build_constant_load(b, nir_build_deref_struct(b, deref, i),
                              c->elements[i]);
       }
    } else {
-      assert(glsl_type_is_array(deref->type));
+      assert(glsl_type_is_array(deref->type) ||
+             glsl_type_is_matrix(deref->type));
       unsigned len = glsl_get_length(deref->type);
       for (unsigned i = 0; i < len; i++) {
          build_constant_load(b,
-                             nir_build_deref_array(b, deref, nir_imm_int(b, i)),
+                             nir_build_deref_array_imm(b, deref, i),
                              c->elements[i]);
       }
    }
@@ -91,41 +80,36 @@ nir_lower_constant_initializers(nir_shader *shader, nir_variable_mode modes)
 {
    bool progress = false;
 
-   nir_builder builder;
-   if (modes & ~nir_var_local)
-      nir_builder_init(&builder, nir_shader_get_entrypoint(shader));
+   nir_foreach_function(function, shader) {
+      if (!function->impl)
+        continue;
 
-   if (modes & nir_var_shader_out)
-      progress |= lower_const_initializer(&builder, &shader->outputs);
+      bool impl_progress = false;
 
-   if (modes & nir_var_global)
-      progress |= lower_const_initializer(&builder, &shader->globals);
+      nir_builder builder;
+      nir_builder_init(&builder, function->impl);
 
-   if (modes & nir_var_system_value)
-      progress |= lower_const_initializer(&builder, &shader->system_values);
+      if ((modes & nir_var_shader_out) && function->is_entrypoint)
+         impl_progress |= lower_const_initializer(&builder, &shader->outputs);
 
-   if (progress) {
-      nir_foreach_function(function, shader) {
-         if (function->impl) {
-            nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                                  nir_metadata_dominance |
-                                                  nir_metadata_live_ssa_defs);
-         }
-      }
-   }
+      if ((modes & nir_var_shader_temp) && function->is_entrypoint)
+         impl_progress |= lower_const_initializer(&builder, &shader->globals);
+
+      if ((modes & nir_var_system_value) && function->is_entrypoint)
+         impl_progress |= lower_const_initializer(&builder, &shader->system_values);
+
+      if (modes & nir_var_function_temp)
+         impl_progress |= lower_const_initializer(&builder, &function->impl->locals);
 
-   if (modes & nir_var_local) {
-      nir_foreach_function(function, shader) {
-         if (!function->impl)
-            continue;
-
-         nir_builder_init(&builder, function->impl);
-         if (lower_const_initializer(&builder, &function->impl->locals)) {
-            nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                                  nir_metadata_dominance |
-                                                  nir_metadata_live_ssa_defs);
-            progress = true;
-         }
+      if (impl_progress) {
+         progress = true;
+         nir_metadata_preserve(function->impl, nir_metadata_block_index |
+                                               nir_metadata_dominance |
+                                               nir_metadata_live_ssa_defs);
+      } else {
+#ifndef NDEBUG
+         function->impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
       }
    }