Rename #rs_export_reduce_new to #rs_export_reduce.

This brings general reduction metadata into conformance with the
specification and removes simple reduction metadata, thereby
disabling simple reduction.  More work will be done later to
fully remove the simple reduction implementation.

Requires a corresponding change in frameworks/compile/slang.

Bug: 23535724
Change-Id: I7effa0ab1cd4ecd75f32e0c8509a737cfbb52dbd

1 files changed, 1 insertions, 13 deletions

diff --git a/bcinfo/MetadataExtractor.cpp b/bcinfo/MetadataExtractor.cpp
index 96f3692..95ef57d 100644
--- a/bcinfo/MetadataExtractor.cpp
+++ b/bcinfo/MetadataExtractor.cpp
@@ -153,13 +153,9 @@ static const llvm::StringRef ExportForEachNameMetadataName =
 // (should be synced with slang_rs_metadata.h)
 static const llvm::StringRef ExportForEachMetadataName = "#rs_export_foreach";
 
-// Name of metadata node where exported simple reduce name information resides
-// (should be synced with slang_rs_metadata.h)
-static const llvm::StringRef ExportReduceMetadataName = "#rs_export_reduce";
-
 // Name of metadata node where exported general reduce information resides
 // (should be synced with slang_rs_metadata.h)
-static const llvm::StringRef ExportReduceNewMetadataName = "#rs_export_reduce_new";
+static const llvm::StringRef ExportReduceNewMetadataName = "#rs_export_reduce";
 
 // Name of metadata node where RS object slot info resides (should be
 // synced with slang_rs_metadata.h)
@@ -621,8 +617,6 @@ bool MetadataExtractor::extract() {
       mModule->getNamedMetadata(ExportForEachNameMetadataName);
   const llvm::NamedMDNode *ExportForEachMetadata =
       mModule->getNamedMetadata(ExportForEachMetadataName);
-  const llvm::NamedMDNode *ExportReduceMetadata =
-      mModule->getNamedMetadata(ExportReduceMetadataName);
   const llvm::NamedMDNode *ExportReduceNewMetadata =
       mModule->getNamedMetadata(ExportReduceNewMetadataName);
   const llvm::NamedMDNode *PragmaMetadata =
@@ -648,12 +642,6 @@ bool MetadataExtractor::extract() {
     return false;
   }
 
-  if (!populateNameMetadata(ExportReduceMetadata, mExportReduceNameList,
-                            mExportReduceCount)) {
-    ALOGE("Could not populate export reduce metadata");
-    return false;
-  }
-
   if (!populateForEachMetadata(ExportForEachNameMetadata,
                                ExportForEachMetadata)) {
     ALOGE("Could not populate ForEach signature metadata");