Support for using and typedef on channels and memories.

PiperOrigin-RevId: 721522097

Author: Sean Purser-Haskell

xls/contrib/xlscc/translate_io.cc

@@ -225,6 +225,11 @@ absl::StatusOr<bool> Translator::TypeIsChannel(clang::QualType param,
     }
   }
 
+  if (type->getTypeClass() == clang::Type::TypeClass::Typedef) {
+    return TypeIsChannel(
+        clang::QualType(type->getUnqualifiedDesugaredType(), 0), loc);
+  }
+
   if (auto record = clang::dyn_cast<const clang::RecordType>(type)) {
     clang::RecordDecl* decl = record->getDecl();
 
@@ -283,6 +288,12 @@ absl::StatusOr<std::shared_ptr<CChannelType>> Translator::GetChannelType(
     if (template_spec->isTypeAlias()) {
       return GetChannelType(template_spec->getAliasedType(), ctx, loc);
     }
+  } else if (auto typedef_type = clang::dyn_cast<const clang::TypedefType>(
+                 stripped.base.getTypePtr());
+             typedef_type != nullptr) {
+    const clang::Type* type = stripped.base.getTypePtr();
+    return GetChannelType(
+        clang::QualType(type->getUnqualifiedDesugaredType(), 0), ctx, loc);
   } else if (auto record = clang::dyn_cast<const clang::RecordType>(
                  stripped.base.getTypePtr());
              record != nullptr) {

xls/contrib/xlscc/unit_tests/translator_memory_test.cc

@@ -1378,5 +1378,86 @@ TEST_F(TranslatorMemoryTest, Size) {
       content);
 }
 
+TEST_F(TranslatorMemoryTest, PassMemoryAliased) {
+  const std::string content = R"(
+      using StoreType =  __xls_memory<int, 32>;
+
+      void sub(StoreType& memory,
+               __xls_channel<int>& out,
+               int addr) {
+         const int val = memory[addr];
+         out.write(3*val);
+      }
+
+      #pragma hls_top
+      void my_package(__xls_channel<int>& in,
+                      StoreType& memory,
+                      __xls_channel<int>& out) {
+         const int addr = in.read();
+         sub(memory, out, addr);
+      })";
+
+  IOTest(
+      content,
+      /*inputs=*/{IOOpTest("in", 7, true), IOOpTest("memory__read", 10, true)},
+      /*outputs=*/
+      {IOOpTest("memory__read", xls::Value(xls::UBits(7, 5)), true),
+       IOOpTest("out", 30, true)});
+}
+
+TEST_F(TranslatorMemoryTest, PassMemoryTypedef) {
+  const std::string content = R"(
+      typedef __xls_memory<int, 32> StoreType;
+
+      void sub(StoreType& memory,
+                       __xls_channel<int>& out,
+                       int addr) {
+         const int val = memory[addr];
+         out.write(3*val);
+      }
+
+      #pragma hls_top
+      void my_package(__xls_channel<int>& in,
+                       StoreType& memory,
+                       __xls_channel<int>& out) {
+         const int addr = in.read();
+         sub(memory, out, addr);
+      })";
+
+  IOTest(
+      content,
+      /*inputs=*/{IOOpTest("in", 7, true), IOOpTest("memory__read", 10, true)},
+      /*outputs=*/
+      {IOOpTest("memory__read", xls::Value(xls::UBits(7, 5)), true),
+       IOOpTest("out", 30, true)});
+}
+
+TEST_F(TranslatorMemoryTest, PassChannelAliased) {
+  const std::string content = R"(
+      using ChannelType =  __xls_channel<int>;
+
+      void sub(__xls_memory<int, 32>& memory,
+                       ChannelType& out,
+                       int addr) {
+         const int val = memory[addr];
+         out.write(3*val);
+      }
+
+      #pragma hls_top
+      void my_package(__xls_channel<int>& in,
+                       __xls_memory<int, 32>& memory,
+                       ChannelType& out) {
+         const int addr = in.read();
+         sub(memory, out, addr);
+      })";
+
+  IOTest(
+      content,
+      /*inputs=*/{IOOpTest("in", 7, true), IOOpTest("memory__read", 10, true)},
+      /*outputs=*/
+      {IOOpTest("memory__read", xls::Value(xls::UBits(7, 5)), true),
+       IOOpTest("out", 30, true)});
+}
+
 }  // namespace
 }  // namespace xlscc